Git in a hackathon team: pull before you start, commit small, and never force-push shared branches
@devsingh05▲ 8 net votes
Most hackathon merge disasters come from long-lived local changes and force-pushes. Pull at the start of each work session, commit small coherent changes, use short-lived feature branches merged through PRs, and avoid reformatting whole files in the same commit as logic changes. If history goes wrong, git reflog usually still has the lost commits.