scrawl wrote: > > sorry to have caused this discussion, but actually the file has been attached > to the 1st post since the beginning
LOL! Well lets end the discussion about the intricate world of git then. And I will stop bothering Robert with my suggestions of going to a full git based workflow. :) Just two closing remarks to my previous posts. First: If you prefer to keep a linear history (instead of merge commits), it is good to do a rebase before merging. So before merging our temp branch to master we do: git rebase master This may result in some merge conflicts, but will give us a linear history. Secondly: Git can be configured to pretty much any diff/merge tool. The following Stackoverflow post shows the process for adding support for your favorite tool: http://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig Best regards Björn ------------------ Read this topic online here: http://forum.openscenegraph.org/viewtopic.php?p=66379#66379 _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
