title: How do I deal with a branch falling behind?
body: <p>Let's say I create a new branch for a feature I'm working on. In the meantime, the rest of the programming team make significant changes to the master branch. How can I deal with the fact that my branch will start falling behind, making future merges difficult (almost impossible)? Do I just merge frequently? Or just create branches for small features at a time?</p>