qmk_firmware/newbs_git_best_practices.html

24 lines
96 KiB
HTML
Raw Normal View History

<!DOCTYPE html>
<html lang="en-US" dir="ltr">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>Best Git Practices for Working with QMK | QMK Firmware</title>
<meta name="description" content="Documentation for QMK Firmware">
<meta name="generator" content="VitePress v1.1.3">
<link rel="preload stylesheet" href="/assets/style.No8zk9aC.css" as="style">
<script type="module" src="/assets/app.vE_USgrZ.js"></script>
<link rel="preload" href="/assets/inter-roman-latin.Di8DUHzh.woff2" as="font" type="font/woff2" crossorigin="">
<link rel="modulepreload" href="/assets/chunks/framework.DyMmIvSC.js">
<link rel="modulepreload" href="/assets/chunks/theme.L0tESxaJ.js">
<link rel="modulepreload" href="/assets/newbs_git_best_practices.md.BI2-EVI5.lean.js">
<script id="check-dark-mode">(()=>{const e=localStorage.getItem("vitepress-theme-appearance")||"auto",a=window.matchMedia("(prefers-color-scheme: dark)").matches;(!e||e==="auto"?a:e==="dark")&&document.documentElement.classList.add("dark")})();</script>
<script id="check-mac-os">document.documentElement.classList.toggle("mac",/Mac|iPhone|iPod|iPad/i.test(navigator.platform));</script>
</head>
<body>
<div id="app"><div class="Layout" data-v-5d98c3a5><!--[--><!--]--><!--[--><span tabindex="-1" data-v-0f60ec36></span><a href="#VPContent" class="VPSkipLink visually-hidden" data-v-0f60ec36> Skip to content </a><!--]--><!----><header class="VPNav" data-v-5d98c3a5 data-v-ae24b3ad><div class="VPNavBar has-sidebar top" data-v-ae24b3ad data-v-ccf7ddec><div class="wrapper" data-v-ccf7ddec><div class="container" data-v-ccf7ddec><div class="title" data-v-ccf7ddec><div class="VPNavBarTitle has-sidebar" data-v-ccf7ddec data-v-ab179fa1><a class="title" href="/" data-v-ab179fa1><!--[--><!--]--><!--[--><!--[--><!--[--><img class="VPImage dark logo" src="/qmk-logo-dark.svg" alt data-v-8426fc1a><!--]--><!--[--><img class="VPImage light logo" src="/qmk-logo-light.svg" alt data-v-8426fc1a><!--]--><!--]--><!--]--><span data-v-ab179fa1>QMK Firmware</span><!--[--><!--]--></a></div></div><div class="content" data-v-ccf7ddec><div class="content-body" data-v-ccf7ddec><!--[--><!--]--><div class="VPNavBarSearch search" data-v-ccf7ddec><!--[--><!----><div id="local-search"><button type="button" class="DocSearch DocSearch-Button" aria-label="Search"><span class="DocSearch-Button-Container"><span class="vp-icon DocSearch-Search-Icon"></span><span class="DocSearch-Button-Placeholder">Search</span></span><span class="DocSearch-Button-Keys"><kbd class="DocSearch-Button-Key"></kbd><kbd class="DocSearch-Button-Key">K</kbd></span></button></div><!--]--></div><nav aria-labelledby="main-nav-aria-label" class="VPNavBarMenu menu" data-v-ccf7ddec data-v-7f418b0f><span id="main-nav-aria-label" class="visually-hidden" data-v-7f418b0f>Main Navigation</span><!--[--><!--[--><a class="VPLink link VPNavBarMenuLink" href="./" tabindex="0" data-v-7f418b0f data-v-9c663999><!--[--><span data-v-9c663999>Home</span><!--]--></a><!--]--><!--]--></nav><!----><div class="VPNavBarAppearance appearance" data-v-ccf7ddec data-v-e6aabb21><button class="VPSwitch VPSwitchAppearance" type="button" role="switch" title="Switch to dark theme" aria-checked="false" data-v-e6aabb21 data-v-d1f28634 data-v-1d5665e3><span class="check" data-v-1d5665e3><span class="icon" data-v-1d5665e3><!--[--><span class="vpi-sun sun" data-v-d1f28634></span><span class="vpi-moon moon" data-v-d1f28634></span><!--]--></span></span></button></div><div class="VPSocialLinks VPNavBarSocialLinks social-links" data-v-ccf7ddec data-v-0394ad82 data-v-7bc22406><!--[--><a class="VPSocialLink no-icon" href="https://reddit.com/r/olkb" aria-label target="_blank" rel="noopener" data-v-7bc22406 data-v-eee4e7cb><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" width="50px" height="50px"><path d="M 29 3 C 28.0625 3 27.164063 3.382813 26.5 4 C 25.835938 4.617188 25.363281 5.433594 25 6.40625 C 24.355469 8.140625 24.085938 10.394531 24.03125 13.03125 C 19.234375 13.179688 14.820313 14.421875 11.28125 16.46875 C 10.214844 15.46875 8.855469 14.96875 7.5 14.96875 C 6.089844 14.96875 4.675781 15.511719 3.59375 16.59375 C 1.425781 18.761719 1.425781 22.238281 3.59375 24.40625 L 3.84375 24.65625 C 3.3125 26.035156 3 27.488281 3 29 C 3 33.527344 5.566406 37.585938 9.5625 40.4375 C 13.558594 43.289063 19.007813 45 25 45 C 30.992188 45 36.441406 43.289063 40.4375 40.4375 C 44.433594 37.585938 47 33.527344 47 29 C 47 27.488281 46.6875 26.035156 46.15625 24.65625 L 46.40625 24.40625 C 48.574219 22.238281 48.574219 18.761719 46.40625 16.59375 C 45.324219 15.511719 43.910156 14.96875 42.5 14.96875 C 41.144531 14.96875 39.785156 15.46875 38.71875 16.46875 C 35.195313 14.433594 30.800781 13.191406 26.03125 13.03125 C 26.09375 10.546875 26.363281 8.46875 26.875 7.09375 C 27.164063 6.316406 27.527344 5.757813 27.875 5.4375 C 28.222656 5.117188 28.539063 5 29 5 C 29.460938 5 29.683594 5.125 30.03125 5.40625 C 30.378906 5.6875 30.785156 6.148438 31.3125 6.6875 C 32.253906 7.652344 33.695313 8.714844 36.09375 8.9375 C 36.539063 11.238281 38.574219 13 41 13 C 43.75 13 46 10.75 46 8 C 46 5.25 43.75 3 41 3 C 38.605469 3 36.574219 4.710938 36.09375 6.96875 C 34.3125 6.796875 33.527344 6.109375 32.75 5.3125 C 32.300781 4.851563 31.886719
<script>window.__VP_HASH_MAP__=JSON.parse("{\"changelog_20200229.md\":\"DNsowwM1\",\"configurator_architecture.md\":\"DEFTvTlS\",\"capabilities.md\":\"DgKwcj5n\",\"changelog_20230827.md\":\"NSPhmB6l\",\"api_development_environment.md\":\"EhJClb9f\",\"api_development_overview.md\":\"Dcey4ntL\",\"drivers_adc.md\":\"DzU8txf8\",\"changelog_20221126.md\":\"DpbrnXeC\",\"changelog_20220827.md\":\"DjPthqDk\",\"easy_maker.md\":\"DAfbIK4w\",\"features_led_indicators.md\":\"CCZhjHe9\",\"changelog_20201128.md\":\"7XXL02Bn\",\"chibios_upgrade_instructions.md\":\"B5dMtL5R\",\"features_bluetooth.md\":\"CiAjl875\",\"changelog_20230226.md\":\"Cg0AYxIn\",\"capabilities_inc.md\":\"Ca9zpMce\",\"changelog_20190830.md\":\"Drtq3lMy\",\"changelog_20200829.md\":\"CoqrOffn\",\"changelog_20211127.md\":\"ClUawWkq\",\"changelog_20240526.md\":\"iGLFD0SP\",\"faq_build.md\":\"DL_WezA1\",\"drivers_apa102.md\":\"Qb-KXRpF\",\"faq_general.md\":\"BC3pFw4U\",\"faq_misc.md\":\"qGrhOTu4\",\"drivers_audio.md\":\"mqaz6p5N\",\"drivers_gpio.md\":\"C5PvyJVh\",\"feature_advanced_keycodes.md\":\"CX8dJkY-\",\"drivers_i2c.md\":\"Cuj87reB\",\"drivers_flash.md\":\"DhWcHp8S\",\"documentation_best_practices.md\":\"BtEjePaZ\",\"drivers_uart.md\":\"BNBs-m3h\",\"drivers_spi.md\":\"tJVeIT7e\",\"driver_installation_zadig.md\":\"CX9-BACt\",\"breaking_changes.md\":\"BtdqWQlY\",\"documentation_templates.md\":\"Bhkum0wD\",\"feature_eeprom.md\":\"a0eoTZm7\",\"features_rgblight.md\":\"DehQikiL\",\"features_split_keyboard.md\":\"mMTUzI5n\",\"keycodes_basic.md\":\"CHIeCvwn\",\"keycodes_magic.md\":\"CGO3hgMm\",\"keycodes_us_ansi_shifted.md\":\"Cs78SDfM\",\"keymap.md\":\"Y4Fei1Ty\",\"newbs.md\":\"-YYNd3dT\",\"mod_tap.md\":\"C7wRKLcf\",\"index.md\":\"B4QYzvHE\",\"features_sequencer.md\":\"DkgqNCsQ\",\"newbs_git_resolving_merge_conflicts.md\":\"72w3BRmm\",\"cli_tab_complete.md\":\"ChaxfzYo\",\"newbs_building_firmware.md\":\"DnVUK9it\",\"breaking_changes_history.md\":\"CkzdD6x8\",\"features_st7565.md\":\"MoajNurJ\",\"arm_debugging.md\":\"BH-H2Ukz\",\"faq_keymap.md\":\"BsEmEZTo\",\"features_caps_word.md\":\"BDQGM0-x\",\"features_stenography.md\":\"Bb_IhUGl\",\"features_combo.md\":\"C-GfDyXJ\",\"features_swap_hands.md\":\"DOhgGQf9\",\"features_command.md\":\"Byl9YoT7\",\"changelog_20231126.md\":\"D2Ok5QAf\",\"understanding_qmk.md\":\"f-Bc_eHQ\",\"keycodes.md\":\"hkOkKJPh\",\"features_rawhid.md\":\"bKKG3KCa\",\"reference_info_json.md\":\"CEbbd-o6\",\"api_docs.md\":\"CRoD6CbL\",\"changelog_20210828.md\":\"DNbHIuuM\",\"features_leader_key.md\":\"DBQTnBRh\",\"faq_debug.md\":\"DuThValw\",\"getting_started_github.md\":\"OYq7IT7B\",\"pr_checklist.md\":\"wj6k-4fV\",\"cli_commands.md\":\"DGx-qNiE\",\"changelog_20210529.md\":\"CR1YNfZX\",\"newbs_git_resynchronize_a_branch.md\":\"YGDefQFx\",\"quantum_painter_qff.md\":\"kLNwshez\",\"feature_debounce_type.md\":\"CUrSp0Iy\",\"feature_userspace.md\":\"BsmY9yWw\",\"quantum_painter_qgf.md\":\"BJNSu2s0\",\"newbs_learn_more_resources.md\":\"Dj1s2BDG\",\"quantum_painter_rle.md\":\"B07V3m-n\",\"ref_functions.md\":\"BVI2uXSN\",\"reference_glossary.md\":\"CXMuxToT\",\"unit_testing.md\":\"u3fgbGUj\",\"custom_matrix.md\":\"DMnRw_5l\",\"platformdev_chibios_earlyinit.md\":\"BQJSTP3y\",\"reference_configurator_support.md\":\"FaBQzIj6\",\"api_overview.md\":\"0FPaUsMb\",\"features_dynamic_macros.md\":\"CrJ1vhBA\",\"features_ps2_mouse.md\":\"CL_pA9sk\",\"features_encoders.md\":\"B2SX3hG2\",\"coding_conventions_c.md\":\"DdrpXBEh\",\"features_grave_esc.md\":\"mUNEjUYS\",\"coding_conventions_python.md\":\"BV-OK1s5\",\"features_dip_switch.md\":\"DtBOdc98\",\"features_haptic_feedback.md\":\"DS8CmC7e\",\"changelog_20220528.md\":\"BX3CCY1Z\",\"features_joystick.md\":\"CW0gZHec\",\"features_hd44780.md\":\"15K40o_e\",\"changelog_20230528.md\":\"nX9R48zP\",\"other_eclipse.md\":\"C-zqyJO9\",\"platformdev_blackpill_f4x1.md\":\"DvObLRuk\",\"quantum_painter.md\":\"BK_I9g4h\",\"configurator_troubleshooting.md\":\"BxGLPT8G\",\"feature_layers.md\":\"8GwBUTZN\",\"configurator_step_by_step.md\":\"GvmPtScT\",\"feature_layouts.md\":\"qcy8hNMO\",\"features_backlight.md\":\"D7R4FkYo\",\"cha
</body>
</html>