News for hackers. Stuff that matters.

A comment on Commits are snapshots not diffs (2020). Parent comment

Re:Commits are snapshots not diffs (2020) by greggman3 on Thursday April 08, 2021 @03:08PM (#26742513)
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.

[ Parent | on HN ]
Re:Commits are snapshots not diffs (2020) by outworlder on Thursday April 08, 2021 @03:12PM (#26742550)
> 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).

[ Parent | on HN ]
Re:Commits are snapshots not diffs (2020) by iudqnolq on Thursday April 08, 2021 @04:01PM (#26743082)
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.
[ Parent | on HN ]