We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
merge-conflicts: format "From the git List" links as a list
Fix whitespace issues Signed-off-by: Johannes Schindelin <[email protected]>
Use links referring to the default branch in a generic way Signed-off-by: Johannes Schindelin <[email protected]>
commas,
more (~last of not many) git list references
discuss what needs remembering, and an alternate description of how the fake merge works, and how to 'replace' it.
Updated Merge Conflicts Resolving and Remembering them (markdown)
more rerere-train'ing stuff
rerere-train
and rerere.autoupdate true
What I'm Learning Is - Hopefully this will bridge the gap for new 'devs to try out the Upstream->GfW->personal release process.