Conflicts aren't specific to git. Git offers a history of those conflict resolutions though, which lets you correct them if they were not done right. I used to

Conflicts aren't specific to git. Git offers a history of those conflict resolutions though, which lets you correct them if they were not done right. I used to store my DayOne journal in git, and boy, their cloud sync conflict resolution was sometimes quite destructive. Having the git history showed me that, and allowed me to correct it.