diff options
| author | QMK Bot <hello@qmk.fm> | 2024-05-30 02:01:09 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2024-05-30 02:01:09 +0000 |
| commit | 47356b220101b4f5b8ca71b2e1aa4f04256dd60f (patch) | |
| tree | 7cf20bd01edf0285053cd9548944fd4133a27567 /docs/newbs_git_resolving_merge_conflicts.md | |
| parent | b36c7b99ae57e8d848373f44755510308c4eefa3 (diff) | |
| parent | 6ef97172889ccd5db376b2a9f8825489e24fdac4 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
| -rw-r--r-- | docs/newbs_git_resolving_merge_conflicts.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/newbs_git_resolving_merge_conflicts.md b/docs/newbs_git_resolving_merge_conflicts.md index 467c13abba..b94bc07942 100644 --- a/docs/newbs_git_resolving_merge_conflicts.md +++ b/docs/newbs_git_resolving_merge_conflicts.md @@ -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 |