[osg-users] Submission/Pull Request problems on github

[John Hughes]

Hi Robert,


robertosfield wrote:
> 
> I'm struggling to find a way to get git to allow me to
> merge one file at a time and presented with a graphics diff that
> allows me to individually accept/discard changes.
> 


There are great tools that do exactly this. I use kdiff3.

http://www.gitguys.com/topics/merging-with-a-gui/

------------------
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67189#67189