how to revert an git accidental pull

Question

Before committing my local change I have accidentally took a pull from master on to my release feature branch. The pull have made many conflicts within my local workspace.

Is there any way to revert the accidental master pull

When I triggered

git reflog --date=iso

c0ec509 HEAD@{2018-12-24 15:55:10 +0530}: clone: from https://bitbucket.com/scm/myproject.git

but the pull which I have done is at 2018-12-28 01:29

Can anyone please tell me how to resolve this.

Possible duplicate of [Undo git pull, how to bring repos to old state](https://stackoverflow.com/questions/1223354/undo-git-pull-how-to-bring-repos-to-old-state) — phd, Dec 31 '18 at 13:19

score 3 · Accepted Answer · answered Dec 31 '18 at 06:56

3

Try git reset --merge. This will abort the merge you have started.

answered Dec 31 '18 at 06:56

Konstantin Labun

3,688
24
24

will this removes my uncommitted changes (which I needs to commit) – Alex Man Dec 31 '18 at 06:58
No it will not remove your changes. It should reset all to the state before merging. But for sure you can make a copy of all your local repo. – Konstantin Labun Dec 31 '18 at 07:03
what is the difference between `git reset --merge` and `git reset --soft` – Alex Man Dec 31 '18 at 07:29
git reset --soft only reset index, while git reset--merge also revert changes between commit your trying to merge and HEAD, but it will not touch uncommited changes. – Konstantin Labun Dec 31 '18 at 07:45
`git reset --merge` is a very old way to spell `git merge --abort`. – torek Dec 31 '18 at 09:23
You shouldn’t have been able to merge if there were uncommitted changes in the working directory – evolutionxbox Dec 31 '18 at 10:41

elp · Answer 2 · 2019-01-06T16:40:02.707

2

git merge --abort to abort the merge.

git reset --hard <commitId> to reset to a specific commit, you will lose anything.

git reset --soft <commitId> to reset to a specific commit, keeps uncommitted changes.

To make sure you do not lose your local commit you can use git stash before doing anything and git stash pop when everything is fine.

edited Jan 06 '19 at 16:40

answered Dec 31 '18 at 06:59

elp

840
3
12
36

score 1 · Answer 3 · answered Dec 31 '18 at 06:59

1

In order to keep your uncommited changes try:

git reset --soft

answered Dec 31 '18 at 06:59

Muhammad Bilal

2,106
1
15
24

does `git reset --soft` have any benefits over `git reset --merge` – Alex Man Dec 31 '18 at 07:29
For details please see: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset – Muhammad Bilal Dec 31 '18 at 07:31
when I did `git reset --soft` I got `fatal: Cannot do a soft reset in the middle of a merge.` – Alex Man Dec 31 '18 at 07:35
It means your merge is not completed yet, Please try elp's answer – Muhammad Bilal Dec 31 '18 at 07:37
how abt `git reset --merge` – Alex Man Dec 31 '18 at 07:39
I havent personally tried it but the definition suggests it should work as well: `Resets the index and updates the files in the working tree that are different between and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added).` – Muhammad Bilal Dec 31 '18 at 07:45

how to revert an git accidental pull

3 Answers3