I wish there were more merge extensions in git. For instance, I would very much like an extension that merged bitmap images in a fine-grained manner, such that I could specify if it's okay to merge two sets of changes or just select the latest one on a consistent basis. This would allow multiple devs to do touch-up work on a single large image instead of having to cut it up into pieces.
You can link Git up to use any mergetool you want, if you have a specific one in mind. I've seen it used with Perforce visual merge tool, opendiff, kdiff3, etc. If you have a tool you like, it's not too difficult to get it setup.
Comments
I wish there were more merge extensions in git. For instance, I would very much like an extension that merged bitmap images in a fine-grained manner, such that I could specify if it's okay to merge two sets of changes or just select the latest one on a consistent basis. This would allow multiple devs to do touch-up work on a single large image instead of having to cut it up into pieces.
You can link Git up to use any mergetool you want, if you have a specific one in mind. I've seen it used with Perforce visual merge tool, opendiff, kdiff3, etc. If you have a tool you like, it's not too difficult to get it setup.
See: http://progit.org/book/ch7-1.html#external_merge_and_diff_to...