When contributing requires editing a file everyone else also edits, in the same place, that file is a lock. Concurrent branches serialize on it, and the conflicts carry no information — two changes that share nothing still collide because both appended after the last thing. That is contention, not carelessness, so “resolve them carefully” is not the fix.
Let each contribution own a file nobody else writes, and generate the shared artifact from those. When the shared file’s content is derivable, generate it outright — then there is no collection step to forget.