Originally Posted by Rythal
Just curious if there is someone who knows git like the back of their hand who if I gave them the rights on github could do dirty merges... unfortunately most of the pushes that are waiting are unable to be merged within github requiring conflict resolution and i'm getting way over my head... I tried following the directions and it's just not working.
|
Sorry don't know git well... but if you take djones advice on hand merging conflict files I recommend WinMerge. Its a great free side by side compare program that I use all the time for merging programming changes. You can open a file in left and right side or you can highlight two files and right click "compare".
Once in the compare alt+down is next change then you can use alt+left or alt+right to copy the changes from right to left or left to right respectively.