Working on a large team of developers can be difficult when trying to keep code, branches, and repositories in sync. Here are a few things that I have found helpful. Branch from master If you are using a ticketing/bug-tracking system, use the ticket/bug identifier in the branch name git checkout -b ticket-1234 Keep your branch up-to-date by syncing master to it frequently git fetch && git merge master Commit to your branch frequently.