Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » how to solve conflicts
how to solve conflicts [message #1058587] Tue, 14 May 2013 14:04 Go to next message
fifth cao is currently offline fifth caoFriend
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)
Re: how to solve conflicts [message #1059584 is a reply to message #1058587] Mon, 20 May 2013 15:21 Go to previous message
Chris Aniszczyk is currently offline Chris AniszczykFriend
Messages: 674
Registered: July 2009
Senior Member
You can look at the User Guide on how to resolve conflicts:
http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
Previous Topic:How to get changed file info specific to a commit using JGit
Next Topic:Cherry pick a range of commit
Goto Forum:
  


Current Time: Mon Dec 22 21:25:20 GMT 2014

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

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