araxis merge git difftool couldn't save file

A developer can work on a bunch of files to add new features or fix a bug, and then commit them as a single new revision. Whenever they see fit, they then merge these commits with the “main” code. This allows developers to work and commit changes to their own repository, independent of the “main” code. Every developer has his (or her) own repository (a repository is where the sourcecode is stored, together with all of the changes and descriptions.) Lately there is a new breed of VCS that doesn’t keep the sourcecode in a single central location. Examples of VCS’s that work(ed) like that are Visual Sourcesafe and Subversion.

Traditionally they had a central location for storing files, and a developer would “check out” a file, work on it, and check it in again, together with a description of what he (or she) did. There are a lot of well-known version control systems. There might be some people still enjoying Homesite as their editor of choice, and seeking a solid VCS system, so here’s an explanation of how I work, and a link to the toolbar I created for using Bazaar from Homesite. I’ve finally come around to releasing the toolbar I use in Homesite for working with Bazaar.

Araxis merge git difftool couldn't save file