Eclipse Community Forums: EGit / JGit » Merge Tool : error: empty path not permitted

Help

Home

Home » Eclipse Projects » EGit / JGit » Merge Tool : error: empty path not permitted

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

Merge Tool : error: empty path not permitted [message #660192]

Thu, 17 March 2011 09:59

nemoo

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!

Report message to a moderator