Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Merge Tool : error: empty path not permitted
Merge Tool : error: empty path not permitted [message #660192] Thu, 17 March 2011 09:59 Go to next message
nemoo is currently offline nemooFriend
Messages: 3
Registered: July 2009
Junior Member
aaargh. damn my whole post was just lost.

ok, hi!

I am using Eclipse Helios Service Release 2
I amusing egit 0.11.3

I wanted to merge a feature from a feature branch into master.

Master contains a bugfix in the same file.

After i merge, i get a conflicts, as expected.

Now i want to resolve the conflict.

Trying Team > Merge Tool > Use Head
gives me an error message "empty path not permitted".

I get the same error with Team > Merge Tool > Use the workspace version of conflicting files.

I could not find anything on this searching the internets.

Any ideas, or should i file a bug?

Cheers!
Re: Merge Tool : error: empty path not permitted [message #665510 is a reply to message #660192] Thu, 14 April 2011 20:44 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 920
Registered: July 2009
Senior Member
Could you file a bug giving the details ?
Previous Topic:Difference between EGit and JGit
Next Topic:Existing project with multiple git repos
Goto Forum:
  


Current Time: Tue Mar 28 23:48:28 GMT 2017

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

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