Eclipse Git（EGit）-在与本地分支进行错误合并和提交之后，如何将本地主服务器恢复为远程主服务器

Question

I have the following setup:

• Remote origin/master (default branch)

• Locally, I got the master and created another branch - NewBranch.

Someone in my team updated master on the remote. I was able to pull in all the changes that they made.

However, while merging I had conflicts. Unintentionally, instead of updating NewBranch with the conflicted result, I have updated the local master with NewBranch (because master was the one that was currently checked out-or "active" in Eclipse). Furthermore I committed this change (locally) to my local master branch...

I was able to switch to NewBranch and merge it with all the latest changes (so my Newbranch is perfectly the way I want it).

Now, I'd like the master to point to the same version as remote master does. So that in the future I have a clean merge between my NewBranch and the Master

I've tried to "Reset" the master, but after performing a hard reset, the Hash Ids b/w the local master and remote master still do not match.

I also have References in my git eclipse and the reference of FETCH_HEAD is the one I'd like my master to revert to.

How can I do this using git in Eclipse?

Thanks in advance

Answer 1

I am guessing you are asking these 2 questions?

1. Now, I'd like the master to point to the same version as remote master does

If I'm right follow this, if you master should point to remote master

git pull origin master

If your NewBranch should point to remote master

git pull origin NewBranch

2. I also have References in my git eclipse and the reference of FETCH_HEAD is the one I'd like my master to revert to.

Please right-click on project in your eclipse--->go to team----> check the git options

These commands will help you to revert to a specific commit

git checkout master
git reset --hard e3f1e37
git push --force origin master
# Then to prove it (it won't print any diff)
git diff master..origin/master

Alternative

Sometimes you may want to undo a whole commit with all changes. Instead of going through all the changes manually, you can simply tell git to revert a commit, which does not even have to be the last one. Reverting a commit means to create a new commit that undoes all changes that were made in the bad commit. Just like above, the bad commit remains there, but it no longer affects the the current master and any future commits on top of it.

git revert ~specificCommit

But remember this after git revert, if you want to go back, you need to read this Git revert be careful before you do it.

git revert 45ae34 e34526a #created two revert commits

git revert HEAD~2..HEAD #by taking ranges, it will revert last 2 commits

git revert -m 1 <merge_commit_sha> #this basically reverts a merge commit

# To get just one, you could use `rebase -i` to squash them afterwards
# Or, you could do it manually (be sure to do this at top level of the repo)
# get your index and work tree into the desired state, without changing HEAD:
git checkout 34e2w34 .

git commit #commit here

Docs: git docs: undo merges