All geek questions in one place

In what situations should the option strategy flags be used when performing a git merge? (patience | minimal | histogram | myers)

I want to get a high quality diff, and I'm not worried about how long it takes, for example.

git merge --strategy-option=diff-algorithm=minimal develop

From the documents , It is not clear which one is best for situations?

  • default, myers Basic greedy differential algorithm. This is currently the default.

  • minimal Spend extra time to make sure that the smallest possible diff is produced.

  • patience Use the patience algorithm when creating patches.

  • histogram . This algorithm extends the patience algorithm to support common low-occurrence elements. "

Another answer has a summary of the patience algorithm .

  • Is the histogram algorithm always better than the patience algorithm as it extends it?
  • Is the minimum algorithm better than the default because it "spends extra time"?
  • Are --strategy-option=patienceand --strategy-option=diff-algorithm=patienceequivalent?
+4
source share
1 answer

. , , XML C , myers minimum . , , . , - .

0

Source: https://habr.com/ru/post/1541766/

More articles:


All Articles