Eclipse Community Forums: EGit / JGit » Abort merge of a single/multiple file(s) with EGit?

Help

Home

Home » Eclipse Projects » EGit / JGit » Abort merge of a single/multiple file(s) with EGit?

Show: Today's Messages :: Show Polls :: Message Navigator

Abort merge of a single/multiple file(s) with EGit? [message #1464663]

Fri, 07 November 2014 19:35

Lukasz T.

Messages: 8
Registered: March 2014

Junior Member

At EGit's wiki page it says:

*Aborting Merge
If a merge resulted in conflicts you can abort the merge with a hard reset to the current branch. This can be done in state "Conflicts" and in state "Merged", i.e. before and after you have resolved the conflicts.
The hard reset can be done from the team menu, the Git Repositories View or the History View. See Revert all local and staged changes for more details.*

I'd like to know how can I reset to "Conflicts" state (the one with >>>>>>> <<<<<<< marked in a file) a single/multiple selection file(s)? I can reset the whole project, but lets say I have 20 conflicted files that I resolved, and want only one of these to re-do the resolution.

How can I do it?

Report message to a moderator