We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
This wiki page has been migrated to a new location: https://gitforwindows.org/Merge-Conflicts---Resolving-and-Remembering-them