How to resolve conflicts on pull

CostyKiller · Post by **CostyKiller** » Wed Dec 03, 2014 1:29 pm

How can we resolve the conflicts on pull when we update the source with modification?
I have tried with synchronize, manually fix the conflicts and then add to index but is not working... still shows conflict on files on pull.

jurchiks · Post by **jurchiks** » Wed Dec 03, 2014 6:37 pm

https://help.github.com/articles/syncing-a-fork/

Post by **Zoey76** » Wed Dec 03, 2014 8:47 pm

I'm still working on the new guides, merging and conflcit resolution are next on my task list

CostyKiller · Post by **CostyKiller** » Thu Dec 04, 2014 1:43 am

jurchiks wrote:https://help.github.com/articles/syncing-a-fork/

I don't understand how to do it like that, I guess I will wait for the eclipse guides to be released...

Now I make like this
1. synchronize workspace;
2. manually fix the conflicts;
3. merge the changes;

This way the source should be up to date I think.

jurchiks · Post by **jurchiks** » Thu Dec 04, 2014 2:44 pm

That only works for SVN, GIT is completely different. I tried doing it that a long time ago, all I got was 99 problems.

L2J Server

How to resolve conflicts on pull

How to resolve conflicts on pull

Re: How to resolve conflicts on pull

Re: How to resolve conflicts on pull

Re: How to resolve conflicts on pull

Re: How to resolve conflicts on pull