Actually, I want take origin/master origin/head comes one step back on "ce424fc - team split for nba and player injuries".
After that I push origin/master origin/head it wont ask me to take pull of 9a29db2.
My history graph looks like this.
Asked
Active
Viewed 332 times
0
-
your question is not clear... what does `git log --all --oneline --decorate --graph` give you (for the last commits)? And what would you like it to be? – Chris Maes Jan 12 '16 at 10:19
-
do you mean you want to **undo** the merge? – Chris Maes Jan 12 '16 at 10:21
-
both locally and on remote, or only on the remote? – Chris Maes Jan 12 '16 at 10:23
-
Yes. I want to do undo the merge. What to do? – Nits Jan 14 '16 at 08:40
-
Possible duplicate of [Undo a Git merge?](http://stackoverflow.com/questions/2389361/undo-a-git-merge) – Chris Maes Jan 14 '16 at 08:45
-
look in the related commit; something like git reset --hard and then git push -f – Chris Maes Jan 14 '16 at 08:45
1 Answers
0
The remote branch has new commits that you dont have in you local branch.
You have to pull the origin to your local repository to get those changes.
# update your local repository
git fetch --all --prune
# merge the changes to your local master
git pull origin master
Now you are up to date with the server + your changes are merged into your local branch.
CodeWizard
- 128,036
- 21
- 144
- 167
-
I want take origin/master origin/head comes one step back on "ce424fc - team split for nba and player injuries" not on 9a29db2 hash code. Please help me. – Nits Jan 12 '16 at 10:36
-
Read this out: http://stackoverflow.com/questions/34519665/how-to-move-head-checkout-revet-reflog-reset/34519716#34519716 – CodeWizard Jan 12 '16 at 10:37