4 ms·

Now I wonder if the warning suggested by Linus in the linked mail was ever implemented. Did also not know git would not even complain. Does anyone know? (Am on

by bipson 8y ago

Now I wonder if the warning suggested by Linus in the linked mail was ever implemented. Did also not know git would not even complain. Does anyone know? (Am on phone, slightly difficult to check).

ushi 8y ago
yes. its implemented: --allow-unrelated-histories By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added.
- jwilk 8y ago
  This option was added in git v2.9.0, released on 2016-06-13.
- gaius 8y ago
  I have used this many times while taking the opportunity to reorganise repos while migrating earlier version control systems to Git. I still need a crib sheet every time tho’!
- Programmatic 8y ago
  See also the relevant lines in the function he proposed a patch for: https://github.com/git/git/blob/master/builtin/merge.c#L1401 https://github.com/git/git/blob/master/builtin/merge.c#L1401
superflyguy 8y ago
What might have happened had you waited until you were off the phone?
- komali2 8y ago
  He might have forgotten to check, or ask. This reminds me of the last interaction I had on #lesswrong - I openly speculated about the UI of a system I didn't have access to, because I wanted to chat about it with people I generally respected. But some of those people just weren't in a good mood and lambasted me for not simply "googling it for the answer." Never mind that the answer isn't easily found, and never mind that that completely invalidates my whole reason for interpersonal interaction anyway...
  - lainga 8y ago
    Interpersonal interaction on #lesswrong is just wasted time that you could have spent praising the coming machine-god so it won't kill you.
  - kchr 8y ago
    I can relate. Seems that people today has no time for the social part of conversation and the creative effects of speculation. I often stop my friends when they reach for their smartphones in an argument or discussion, so that we can converse without proving facts.

by bipson 8y ago

Now I wonder if the warning suggested by Linus in the linked mail was ever implemented. Did also not know git would not even complain. Does anyone know? (Am on phone, slightly difficult to check).

ushi 8y ago

yes. its implemented: --allow-unrelated-histories By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added.

jwilk 8y ago
This option was added in git v2.9.0, released on 2016-06-13.
gaius 8y ago
I have used this many times while taking the opportunity to reorganise repos while migrating earlier version control systems to Git. I still need a crib sheet every time tho’!
Programmatic 8y ago
See also the relevant lines in the function he proposed a patch for: https://github.com/git/git/blob/master/builtin/merge.c#L1401 https://github.com/git/git/blob/master/builtin/merge.c#L1401

superflyguy 8y ago

What might have happened had you waited until you were off the phone?

komali2 8y ago
He might have forgotten to check, or ask. This reminds me of the last interaction I had on #lesswrong - I openly speculated about the UI of a system I didn't have access to, because I wanted to chat about it with people I generally respected. But some of those people just weren't in a good mood and lambasted me for not simply "googling it for the answer." Never mind that the answer isn't easily found, and never mind that that completely invalidates my whole reason for interpersonal interaction anyway...
- lainga 8y ago
  Interpersonal interaction on #lesswrong is just wasted time that you could have spent praising the coming machine-god so it won't kill you.
- kchr 8y ago
  I can relate. Seems that people today has no time for the social part of conversation and the creative effects of speculation. I often stop my friends when they reach for their smartphones in an argument or discussion, so that we can converse without proving facts.