git automatic merge of two commits applying the same change

Asked Oct 26 '18 at 06:47

Active Oct 26 '18 at 06:47

Viewed 47 times

Does an automatic merge in git recognize when two different commits made the same changes to a file? Or does this result in a conflict?

asked Oct 26 '18 at 06:47

nnolte

so the answer would be a simple "no", right? – nnolte Oct 26 '18 at 07:23
Pretty much, but then the obvious follow-up question is "can I make it behave that way?" Please accept the nominated duplicate. – tripleee Oct 26 '18 at 07:26

0 Answers0