Tech Talk on Merging Conflicting Code
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: