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

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

how to solve conflicts [message #1058587]

Tue, 14 May 2013 10:04

Eclipse User

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 11:21

Eclipse User

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:	How to get a file from specific commit (JGit)

Goto Forum:

-=] Back to Top [=-

Current Time: Tue Jul 22 22:40:41 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter