by Jeff Jensen | Sep 23, 2013 | GitHub, Source Control
Git mergetool: Source merging is inevitable with concurrent development. To help with merges, source control products have a merge tool. Some, including Git, allow configuring your favorite merge tool vs forcing use of their own merge tool. Built-In Merge Tool...