Rebase pull
2019-04-16 本文已影响0人
JaedenKil
When I was fixing a issue on branch issue_2065
, did some improvement and pushed to remote git push -u upstream issue_2065
.
Later I was pushing again on that branch, an error showed up:
error: failed to push some refs to 'XXX.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
On local branch issue_2065
:
8cac380 (HEAD -> issue_2065) Update JenkinsRun
f204c95 (upstream/issue_2065) Update overscan prop related command
8c29732 Update log
b8911a3 Update log
4a3a28e Add more log
f50e1a8 Update Jenkins shell script to adapt to android pi test
...
While on remote branch issue_2065
:
d00b3d6 (upstream/issue_2065) fix api 27 for android o or older
a61ca05 little improve for JenkinsRun for set overscan prop
f204c95 Update overscan prop related command
8c29732 Update log
b8911a3 Update log
4a3a28e Add more log
f50e1a8 Update Jenkins shell script to adapt to android pi test
68bfeb4 (upstream/master, master) Merge branch 'optimize_add_step_log' of JaedenKil/OverscanTest_Marvell_DEBU_SQA into master
0b8a401 (optimize_add_step_log) Add suite log
So have to fetch commits a61ca05
and d00b3d6
:
git pull --rebase upstream issue_2065
Pull repo upstream
branch issue_2065
to local branch issue_2065
&& rebase changes to local branch issue_2065
.