qmk_firmware/assets/newbs_git_best_practices.md.C0QiIl7V.js

16 lines
2.4 KiB
JavaScript
Raw Permalink Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

import { _ as _export_sfc, c as createElementBlock, o as openBlock, a8 as createStaticVNode } from "./chunks/framework.Cauyuiy8.js";
const __pageData = JSON.parse('{"title":"Best Git Practices for Working with QMK","description":"","frontmatter":{},"headers":[],"relativePath":"newbs_git_best_practices.md","filePath":"newbs_git_best_practices.md","lastUpdated":null}');
const _sfc_main = { name: "newbs_git_best_practices.md" };
const _hoisted_1 = /* @__PURE__ */ createStaticVNode('<h1 id="best-git-practices-for-working-with-qmk" tabindex="-1">Best Git Practices for Working with QMK <a class="header-anchor" href="#best-git-practices-for-working-with-qmk" aria-label="Permalink to &quot;Best Git Practices for Working with QMK&quot;"></a></h1><h2 id="or-how-i-learned-to-stop-worrying-and-love-git" tabindex="-1">Or, &quot;How I Learned to Stop Worrying and Love Git.&quot; <a class="header-anchor" href="#or-how-i-learned-to-stop-worrying-and-love-git" aria-label="Permalink to &quot;Or, &quot;How I Learned to Stop Worrying and Love Git.&quot;&quot;"></a></h2><p>This section aims to instruct novices in the best ways to have a smooth experience in contributing to QMK. We will walk through the process of contributing to QMK, detailing some ways to make this task easier, and then later we&#39;ll break some things in order to teach you how to fix them.</p><p>This section assumes a few things:</p><ol><li>You have a GitHub account, and have <a href="./getting_started_github">forked the qmk_firmware repository</a> to your account.</li><li>You&#39;ve set up both <a href="./newbs_getting_started#set-up-your-environment">your build environment</a> and <a href="./newbs_getting_started#set-up-qmk">QMK</a>.</li></ol><hr><ul><li>Part 1: <a href="./newbs_git_using_your_master_branch">Your Fork&#39;s Master: Update Often, Commit Never</a></li><li>Part 2: <a href="./newbs_git_resolving_merge_conflicts">Resolving Merge Conflicts</a></li><li>Part 3: <a href="./newbs_git_resynchronize_a_branch">Resynchronizing an Out-of-Sync Git Branch</a></li></ul>', 7);
const _hoisted_8 = [
_hoisted_1
];
function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
return openBlock(), createElementBlock("div", null, _hoisted_8);
}
const newbs_git_best_practices = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
export {
__pageData,
newbs_git_best_practices as default
};