[help] Tips on resolving git conflicts, for the faint hearted

FarraigePlaisteach
Tue, 09 Apr 2024 12:29:25 +0000

I’ve been using git to keep revisions of my website. Since I work alone I only need three commands:

git add -A
git commit -m “<description>”
git push

Soon I’ll be adding a second person, and I remember from experience that conflicts can happen even with two people. So I have two questions:

Is there a way we can avoid that happening outright?

Are the commands to resolve fairly standard or does it differ much on a case-by-case basis? I’m hoping to keep the number of commands as small as possible.

Comments URL: https://tildes.net/~comp/1fhs/help_tips_on_resolving_git_conflicts_for_the_faint_hearted

Votes: 10

Comments: 42