A bad merge can ruin your weekend. Pull often, commit small, and talk to your team.