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.
|
I would suggest git extensions. You can have it install with a program called kdiff3, which will show you the merge differences, and let you pretty easily select which version to keep. It is what I use at work when on windows.