rebase
Expert help resolving Git merge conflicts with non-destructive merges that preserve behavior from both sides. Use when the user is merging or rebasing main into a feature branch, hits conflict markers, or invokes /z:rebase.
Pinned to revision 4d8598569ead, so it is the text this page describes rather than whatever the author pushed since.
Files
Every link opens the file at its source, pinned to the revision this page describes.