Comment

Comment by ipioxu15

Git is certainly the best of the version control systems to date, and I'm happy that it won. Experts have no problems with issues like this.

The described failure mode also can occur in any existing version control system --- the user is essentially did

cp -f ../mybranch/somefile-new.c somefile.c; hg commit somefile.c

The history in mybranch touching somefile.c is now partly useless, since all the patches are already applied. Of course, the branch can still be merged, if the conflicts are resolved --- the conflict resolution is then pretty much doing the above command again.

parent ipioxu15 10 years ago

Discussion

Live from the official Hacker News API

A modern reader for Hacker News · SvelteKit + Skeleton