Dave Worth’s Tech Talk today is on merging codebases, using some workflow tricks and the GitFugitive vim plugin (“a Git wrapper so awesome, it should be illegal”) by Tim Pope.

We regularly work with other software development teams, and merging codebases and features is routine work for us. Dave shows us his workflow so we can get faster, and more efficient at merging lots of features all at once, together.

We love sharpening our axes at Highgroove. One way is through slick tools that can save us typing, time, and just make things easier. Using git through an interactive rebase with conflicts can be daunting. Dave shows us how to use vim, coupled with git, along with Git Fugitive to make quick work of a nasty rebase.

For more info on some of the tools, here are some links:

• Git Fugitive plugin – https://github.com/tpope/vim-fugitive
• Vimcasts – http://vimcasts.org/ (lots of good stuff including basically Dave’s talk over n parts)
• MacVim – http://code.google.com/p/macvim/ – (like Textmate only different) Zing!