For DiffMerge select the OS X 10.6+ Installer (Intel) package installer (not the DMG). If you’re frugal like me, you’ll need to download the DiffMerge application from SourceGear (DiffMerge is Mac only, but similar softwares exist for Windows, I use WinMerge). If you’ve got money to burn($25) you can buy yourself the fancy Sublimerge. In order to visualize the merge you’ll need your GUI. This tutorial is all Mac, but it applies for Windows as well (I’m sure Linux kids can sort this out with a Vim plugin). If you’re using Github’s fancy desktop client, you’ll have to touch your terminal a little, but I swear it won’t hurt. If you’re a terminal pro you might flinch at the idea of working outside of your text editor, but I assure you it’s more fun to get your merges done quickly and save your brain’s computing power for more engaging programming problems. Integrating a GUI merge tool into your git workflow is a breeze. But there will be times when you and another developer are in lightspeed-productivity-mode on the same file, and when it comes to spinning down the hyperdrives, one of you may be met with the heinous task of joining your histories together. The best way to avoid the process of a manual merge is to be proactive about commits, pull requests, and pulling in the latest changes from your upstream master. Wrecking a merge can feel as bad as breaking the build. Merging in git is almost as scary as merging in Dallas: Solving git Merge Conflicts with a GUI Tool
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |