summaryrefslogtreecommitdiffstats
path: root/docs/newbs_git_resolving_merge_conflicts.md
Commit message (Expand)AuthorAgeFilesLines
* [Docs] Restructure of Git Best Practices doc (#7231)James Young2019-12-021-0/+79
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 06:13:35 +0000
[cgit] Unable to lock slot /tmp/cgit/04000000.lock: No such file or directory (2)