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

John Hughes johughes at teslamotors.com
Sat May 21 11:48:34 PDT 2016

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.


Read this topic online here:

More information about the osg-users mailing list