3 ms·

I don't have a solution and maybe the problem is just not solvable but ... The tragedy is that git is so hard to learn. Start a github project (I know github i

I don't have a solution and maybe the problem is just not solvable but ... The tragedy is that git is so hard to learn. Start a github project (I know github is not git). 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. You'll be stuck giving them a giant lesson, probably an hour to write the instructions, then several back and forths. Mostly, either they already know git and fix it themselves OR I give up and merge it by hand myself since it's easier than becoming a git teacher for them.

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 ago
  It'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.