Regina Alyssa 5168307e6a Fix link to merge conflict docs

2021-11-21 22:41:16 +08:00

..

about-git-rebase.md

Merge branch 'main' into jules-4795

2021-10-18 15:11:48 +02:00

about-git-subtree-merges.md

GHEC version (#20947)

2021-10-15 15:41:33 -05:00

about-git.md

Not as big as it looks! Migrate guide.github.com content (#21942)

2021-10-20 14:53:24 +00:00

dealing-with-non-fast-forward-errors.md

GHEC version (#20947)

2021-10-15 15:41:33 -05:00

dealing-with-special-characters-in-branch-and-tag-names.md

GHEC version (#20947)

2021-10-15 15:41:33 -05:00

getting-changes-from-a-remote-repository.md

Fix link to merge conflict docs

2021-11-21 22:41:16 +08:00

index.md

Not as big as it looks! Migrate guide.github.com content (#21942)

2021-10-20 14:53:24 +00:00

pushing-commits-to-a-remote-repository.md

Merge branch 'main' into jules-4795

2021-10-18 15:11:48 +02:00

resolving-merge-conflicts-after-a-git-rebase.md

add-missing-right-paren

2021-11-03 13:00:41 -04:00

splitting-a-subfolder-out-into-a-new-repository.md

Corrected remaining indentation and spacing

2021-11-16 21:38:47 -08:00

using-git-rebase-on-the-command-line.md

GHEC version (#20947)

2021-10-15 15:41:33 -05:00