Octomerger Bot db282bd4da Merge branch 'main' into repo-sync

2022-10-04 09:27:04 -07:00

..

about-merge-conflicts.md

Remove the emphasize tags and updated attributes style

2022-10-03 00:21:32 +05:30

index.md

Deprecate 3.0 (#25646)

2022-03-03 13:08:24 -06:00

resolving-a-merge-conflict-on-github.md

fix: missing paren in link in "Resolving a merge conflict on GitHub"

2021-11-14 21:55:58 -05:00

resolving-a-merge-conflict-using-the-command-line.md

Merge branch 'main' into repo-sync

2022-10-04 09:27:04 -07:00