Strange, I haven't used a merge tool in 2-3 years. old job: Changes staged locally for 2-3 weeks sometimes. Team-specific branches, integrating into the main

Strange, I haven't used a merge tool in 2-3 years. old job: Changes staged locally for 2-3 weeks sometimes. Team-specific branches, integrating into the mainline periodically.. eventually moved to several hundred devs committing to mainline. One monster repo Beyond Compare 2 was the only tool for the job simply for the ability to provide a manual hint (via spacebar) to align two version of the same file current company: never merge more than a line or two which I do with vim. Change sets only last max 1 week on my machine. We have 5-6 services (each in their own repo). 20 people committing amongst them all. I do wish our code review tool was better though. Perhaps I will take one of the suggestions from this thread and build a custom CR work flow.