On Wed, 11 Oct 2017, Benoît Minisini via Gambas-user wrote: > Hi, > > I have just committed git support in 'master'. > > The whole IDE version control management has been redesigned. Now version > control is managed through a sub-menu in the 'Project' menu, or an > equivalent menu button in the main toolbar. > > Everything is done except conflict management. I must understand how it > works in git, and I'd like to have a file diff tool directly in the IDE, but > it's a big job. >
Just in case you forgot, there is already the Patch class in the IDE which I wrote for the Patch dialogs. It's not much and they don't deal with conflict files but they do parse "diff -u" patches like the ones "git diff" produces. Regards, Tobi -- "There's an old saying: Don't change anything... ever!" -- Mr. Monk ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
