Geek Answers Handbook

How do git reerre figure out the similarities between two conflicts?

Ok, here comes my Q. Does "git rerere" compare the hashes of the two files to figure out the resolution? That is, let's say I have an XML file containing this tag:

<number>12</number>

When I have a conflict, this number usually changes to 13, 14, etc., so I'm stuck:

<<<<<<<
<number>12</number>
=======
<number>13</number>
>>>>>>>

Can reerere automatically resolve this conflict, even if the numbers do not match the last? I always want him to allow it in such a way that it takes up a larger number (in the example above, 13). So, if he writes permission for numbers 12 and 13, will he resolve the conflict with different numbers? I have a suspicion that this is not so, but may also ask.

+5
source share
2 answers

reerere , ? , , ( , 13).

, git rerere .

git rerere, :

  • ( , );
  • ,

(, " 12 13" ), - (, " N N + 1" ), git , .

git , - , , , ( , ).

, XML . , . .

, git rerere , , . , , . , . .

+7

Vanilla git . .

" " gitattributes man. , , .

+2
source

More articles:


All Articles