Eclipse Community Forums: EGit / JGit » how to solve conflicts

Help

Home

Home » Eclipse Projects » EGit / JGit » how to solve conflicts

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

how to solve conflicts [message #1058587]

Tue, 14 May 2013 14:04

fifth cao

Messages: 1
Registered: May 2013

Junior Member

I have used the egit plugin.

and after i edit the .classpath file, i fetch from the upstream

the when i commit the changes it alert error of conflicts

I don't know how to solve the prolem.

It seems that the merge tool does work at all(one i close the compare window, changes are all rollback)

Report message to a moderator