如何恢复git意外拉动

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.

Answer 1

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.

Answer 2

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

Answer 3

为了保留您未提交的更改，请尝试：

git reset --soft