I already googled, and read many document. but Unfortunately I cannot understand them all
My situation is.
git branch -r
origin/HEAD -> origin/master
origin/master
origin/team/myteam
git branch -a
master
team/myteam
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/team/myteam
and Now I like to merge every patches from master to remote mybranch
.
I tried
git checkout team/myteam
git rebase master
git status
On branch team/myteam
Your branch and 'origin/team/myteam' have diverged,
and have 238 and 18 diffrent commits each, respectively.
nothing to commit, working directory clean
it seems works.. but push
returns error..
I use gerrit.
git push origin HEAD:refs/for/team/mybranch
...
..
remote: Resolving
deltas: 100% (14481/14481) remote: Processing changes: refs: 1, done
To ssh://156.xxx.xxx.xxx/xxx ! [remote rejected] HEAD -> refs/for/team/myteam (change 228 closed)
error: failed to push some refs to 'ssh://156.xxx.xxx.xxx/xxx