Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » "Replace With..." actions disabled during repository conflict state
"Replace With..." actions disabled during repository conflict state [message #1022678] Fri, 22 March 2013 10:39 Go to next message
Michele Castellucci is currently offline Michele Castellucci
Messages: 2
Registered: March 2013
Junior Member
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 11:41 Go to previous message
Michele Castellucci is currently offline Michele Castellucci
Messages: 2
Registered: March 2013
Junior Member
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:
  


Current Time: Mon Sep 22 06:26:15 GMT 2014

Powered by FUDForum. Page generated in 0.02951 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software