|How to resolve conflicts? EGit Mac [message #645428]
||Fri, 17 December 2010 09:12
Registered: July 2010
I am new with EGit, used SVN before. I just merged two branches which resulted in a conflict. I resolved manually, but now I cannot find where to "mark" it as resolved. I thought about the team synchronization view, but I cannot populate it with git. When I go to the Team Sync view and press Synchronize... -> Git a list with my repositories shows up. However, the finish button is greyed out. So I cannot populate the Team Synchronization view.
Can you tell me how to set my conflicting files to resolved?
Thanks in advance!
[Updated on: Fri, 17 December 2010 09:13]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.02878 seconds