3 ms·
> Take a PR, have the PR have a conflict, now, try to explain to the new user how they can fix their PR via git to not conflict. Is this a Git problem? I recal
by outworlder 6y ago
> Take a PR, have the PR have a conflict, now, try to explain to the new user how they can fix their PR via git to not conflict.
Is this a Git problem? I recall entire workdays being wasted on SVN and CVS back in the day with multiple people trying to make sense of a merge.
In Git this is actually easier to do (and easier to do repeatedly, with git rerere and similar).
- iudqnolq 6y agoIt's a problem, and the place to fix it is in git. That makes it a git problem. Just because things were worse back in the day doesn't mean we can't have nice things.