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

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

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

Fri, 07 November 2014 14:35

Eclipse User

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?

Re: Abort merge of a single/multiple file(s) with EGit? [message #1468598 is a reply to message #1464663]

Mon, 10 November 2014 19:21

Eclipse User

I think that's not possible using EGit

Re: Abort merge of a single/multiple file(s) with EGit? [message #1474298 is a reply to message #1468598]

Sat, 15 November 2014 04:24

Eclipse User

That's a shame. It would be very usefull in my opinion. Thanks for the answer.

Previous Topic:	Does Egit rumtime override the settings in the plugin.xml?
Next Topic:	Using local repository as shared repository

Goto Forum:

-=] Back to Top [=-

Current Time: Mon Jul 07 05:59:50 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter