Git 2.56 has been released. This version has some major improvements in staging, in that you can use git add --resolved to stage only conflicted files and won't add files that may have other local edits; this has the potential to make merges far easier to work with, and maybe those constant stray <<<<<<< markers finally get to be relegated to /dev/null where they belong.
There are other improvements: git bisect run cleans up after itself, git log --follow is better as well.
We also see calculations for merging improved, and some other features as well: see the feature highlights for more detail.
Your package managers should be able to update git in place soon, if it's not already there.
Comments (0)
No comments yet.
Log in to comment