summaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
AgeCommit message (Expand)Author
2019-12-02[Docs] Restructure of Git Best Practices doc (#7231)James Young