Page 1 of 1
How to resolve conflicts on pull
Posted: Wed Dec 03, 2014 1:29 pm
by CostyKiller
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.
Re: How to resolve conflicts on pull
Posted: Wed Dec 03, 2014 6:37 pm
by jurchiks
Re: How to resolve conflicts on pull
Posted: Wed Dec 03, 2014 8:47 pm
by Zoey76
I'm still working on the new guides, merging and conflcit resolution are next on my task list
Re: How to resolve conflicts on pull
Posted: Thu Dec 04, 2014 1:43 am
by CostyKiller
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.
Re: How to resolve conflicts on pull
Posted: Thu Dec 04, 2014 2:44 pm
by jurchiks
That only works for SVN, GIT is completely different. I tried doing it that a long time ago, all I got was 99 problems.