aboutsummaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
Commit message (Expand)AuthorAgeFilesLines
* Vitepress conversion of docs. (#23795)Nick Brassel2024-05-301-1/+3
* [Docs] Restructure of Git Best Practices doc (#7231)James Young2019-12-021-0/+79