DL-Mirrors/keychron-vial-shenanigans
0
0
Fork 0
mirror of https://github.com/nalf3in/vial-qmk.git synced 2025-12-22 03:30:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vitepress conversion of docs. (#23795)

Browse Source
This commit is contained in:
Nick Brassel
2024-05-30 12:00:41 +10:00
committed by GitHub
parent 395766657f
commit 6ef9717288
357 changed files with 3611 additions and 24208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/newbs_git_resolving_merge_conflicts.md
View File

@@ -2,7 +2,9 @@
Sometimes when your work in a branch takes a long time to complete, changes that have been made by others conflict with changes you have made to your branch when you open a pull request. This is called a *merge conflict*, and is what happens when multiple people edit the same parts of the same files.
?> This document builds upon the concepts detailed in [Your Fork's Master: Update Often, Commit Never](newbs_git_using_your_master_branch.md). If you are not familiar with that document, please read it first, then return here.
::: tip
This document builds upon the concepts detailed in [Your Fork's Master: Update Often, Commit Never](newbs_git_using_your_master_branch). If you are not familiar with that document, please read it first, then return here.
:::
## Rebasing Your Changes