Git 2.56 adds git add --resolved to stage only resolved conflicts
Git 2.56 introduces git add --resolved, which stages only files that were in conflict and refuses to stage them while conflict markers remain. The release also brings git branch --delete-merged, git bisect --reset-when-found, git history drop and git refs create/update/delete/rename.
- git add --resolved stages only conflicted files and checks for leftover conflict markers
- git branch --delete-merged removes local branches whose work already landed upstream
- git bisect --reset-when-found ends the bisect session automatically when the bad commit is found
- git refs create/update/delete/rename offers safe ref handling with no silent overwrites
Read next
Software