Originally Posted by dhjohn
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.
|
Thanks for that suggestion... i've been using kdiff now and it really has made doing the merges so much easier. Hopefully it won't take too long to get the merges up to date then I can get back to trying to fix things... i've been lax on trying to find the bugs not wanting to even further dirty the master compared to the waiting pushes (tho I have been doing some, like the scales going to 7 instead of 6 to try fixing the sz nil problem).