DevOps Expert

Git 2.35 is out, and now we have a new zdiff3 conflict style. 🎉

zdiff3 makes the conflict area smaller by moving all common lines at the beginning or end of a conflict outside the conflicted region.
A comparison of merge, diff3 and new zdiff3 styles can be seen in the picture.
In this example, we appended foo and bar at the start and baz at the conclusion in both commits. However, using zdiff3-style conflict markers transfers the foo, bar and baz outside of the conflicted region entirely. It combines the best of both worlds. The end result is more precise (due to the inclusion of the merging base) and concise (since it handles redundant parts of the conflict for us). You can use it as of now by changing merge.conflictstyle in your git config.

git config merge.conflictstyle zdiff3

Link:
◾️https://github.blog/2022-01-24-highlights-from-git-2-35/

Source: @fullstacks_mag
〰️〰️〰️〰️〰️〰️
© @DevOpsEx

www.tgoop.com/DevOpsEx/226

1.65K viewsHomayoun Sadeghi, edited  Jan 25, 2022 at 11:51

Git 2.35 is out, and now we have a new zdiff3 conflict style. 🎉

zdiff3 makes the conflict area smaller by moving all common lines at the beginning or end of a conflict outside the conflicted region.
A comparison of merge, diff3 and new zdiff3 styles can be seen in the picture.
In this example, we appended foo and bar at the start and baz at the conclusion in both commits. However, using zdiff3-style conflict markers transfers the foo, bar and baz outside of the conflicted region entirely. It combines the best of both worlds. The end result is more precise (due to the inclusion of the merging base) and concise (since it handles redundant parts of the conflict for us). You can use it as of now by changing merge.conflictstyle in your git config.

git config merge.conflictstyle zdiff3

Link:
◾️https://github.blog/2022-01-24-highlights-from-git-2-35/

Source: @fullstacks_mag
〰️〰️〰️〰️〰️〰️
© @DevOpsEx

BY DevOps Expert