Eclipse Community Forums: EGit / JGit » "Replace With..." actions disabled during repository conflict state

Home » Eclipse Projects » EGit / JGit » "Replace With..." actions disabled during repository conflict state

"Replace With..." actions disabled during repository conflict state [message #1022678]

Fri, 22 March 2013 06:39

Eclipse User

Hello everybody,
I experienced an annoying situation during rebase/merge with conflicts.
I would like to select all conflicting files on my Package Explorer and invoke:

"Replace with -> HEAD revision"
or
"Replace with -> Commit"

but these entries are disabled on conflict state.

Actually, the only way to replace from HEAD revision could be done via GIT GUI context menu from file content displaying area (which is annoying anyway because it works on a single file and shouldn't be done for a multiple selection)

[ The needing for that is when conflicts should be resolved by a brand new EMF model generation, so I should first revert changes of conflictig files and, after that, regenerate the EMF model ]

Is there a way to do this operation or are these menu-entries scheduled to be enabled on next eGit version?
Thank you all for replies Smile

Michele Castellucci

Re: "Replace With..." actions disabled during repository conflict state [message #1027767 is a reply to message #1022678]

Wed, 27 March 2013 07:41

Eclipse User

I opened a bug for this:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=404424

Previous Topic:	after upgrade from 2.2.0 to 2.3.1: unwanted .gitignore files in SVN projects plus poor performance
Next Topic:	Does Egit Support Mylyn Commit Changesets?

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Jul 12 16:22:09 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter