qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-01 14:29:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

more sidebar labels

Browse Source
This commit is contained in:
Jack Humbert
2023-04-19 10:31:32 -04:00
parent f48a88fc72
commit fff2249a7c
52 changed files with 304 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/newbs_git_resolving_merge_conflicts.md
+5
View File
@@ -1,3 +1,8 @@
---
sidebar_position: 2
sidebar_label: Merge Conflicts
---
# Resolving Merge Conflicts
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.