Conundrum

  • Archive
  • RSS
Most merges do cleanly resolve, and this behavior resulted in people making their merges too easily and lightly, even when the reason why the merge was made in the first place should be explained. Nobody explained why the merge was made in a merge commit, because in order to do so after git merge already made the commit, they have to go back and run git commit —amend to do so. Recently in a discussion on the Git mailing list, Linus admitted (and I agreed) that this was one of the design mistakes we made early in the history of Git. And in 1.7.10 and later, the git merge command that is run in an interactive session (i.e. both its standard input and its standard output connected to a terminal) will open an editor before creating a commit to record the merge result, to give the user a chance to explain the merge, just like the git commit command the user runs after resolving a conflicted merge already does.
Git Blame: Anticipating Git 1.7.10 — finally. this is the number one reason I never really liked merging a topic branch: the intent, which is what the commit log is all about, is all but lost.

Source: git-blame.blogspot.com

  • 3 months ago
  • 1
  • Permalink
  • Share
    Tweet

1 Notes/ Hide

  1. barisione liked this
  2. conundrum posted this
← Previous • Next →

About

A revolution is an insurrection

this is my tumblr; it's a place for ranting, quoting dorky stuff, publishing pictures and graphs, and in general providing a stream-of-consciousness-like sort of feel — or, to sound more of a pretentious artsy-writer-hipster-douche: a window over whatever passes through my head.

I also have two blogs, one in italian and one in english. they talk about what I do for a living, mostly, so be prepared for lots of software engineering rants and stuff.
  • RSS
  • Random
  • Archive
  • Mobile

Effector Theme by Carlo Franco.

Powered by Tumblr