->>>>>>> mybranch</code></pre><p>and choose the changes that should be kept. Then you should <code>git add</code> the conflicting files, run <code>git rebase --continue</code>. See <a href="https://docs.github.com/en/github/using-git/resolving-merge-conflicts-after-a-git-rebase">here</a> for more information on this. In case you have may conflicting commits, the rebase can be tedious, you will even have to resolve conflicts for some changes in some earlier commit even if you reverted these changes in a later commit. To avoid this issue, it is recommended to first squash your commits into a single one. To do that, use</p><pre><code class="language-sh hljs">$ git rebase -i master</code></pre><p>and replace <code>pick</code> by <code>s</code> for all commits except the top one and then follow the instructions, see <a href="https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History">here</a> for more details.</p><h2 id="Switch-branches"><a class="docs-heading-anchor" href="#Switch-branches">Switch branches</a><a id="Switch-branches-1"></a><a class="docs-heading-anchor-permalink" href="#Switch-branches" title="Permalink"></a></h2><p>To switch to the branch <code>mybranch</code>, do the following.</p><h3 id="VSCode-7"><a class="docs-heading-anchor" href="#VSCode-7">VSCode</a><a class="docs-heading-anchor-permalink" href="#VSCode-7" title="Permalink"></a></h3><p>On the bottom left, you should see a sort of "Y" symbol with empty circles at the three leaves. On the right, you see the current branch. Click on it and then write or select <code>mybranch</code>.</p><h3 id="Git-bash-7"><a class="docs-heading-anchor" href="#Git-bash-7">Git bash</a><a class="docs-heading-anchor-permalink" href="#Git-bash-7" title="Permalink"></a></h3><p>First <a href="../setup/#Start-Git-bash">Start Git bash</a>.</p><pre><code class="language-sh hljs">$ git checkout mybranch</code></pre><h2 id="Format-your-code"><a class="docs-heading-anchor" href="#Format-your-code">Format your code</a><a id="Format-your-code-1"></a><a class="docs-heading-anchor-permalink" href="#Format-your-code" title="Permalink"></a></h2><p>To format your code, run the following in your Julia REPL. Make sure you have added <a href="https://github.com/domluna/JuliaFormatter.jl">JuliaFormatter.jl</a> before. </p><pre><code class="language-julia hljs">julia> using JuliaFormatter; format(".")</code></pre></article><nav class="docs-footer"><a class="docs-footer-prevpage" href="../setup/">« Set up</a><div class="flexbox-break"></div><p class="footer-message">Powered by <a href="https://github.com/JuliaDocs/Documenter.jl">Documenter.jl</a> and the <a href="https://julialang.org/">Julia Programming Language</a>.</p></nav></div><div class="modal" id="documenter-settings"><div class="modal-background"></div><div class="modal-card"><header class="modal-card-head"><p class="modal-card-title">Settings</p><button class="delete"></button></header><section class="modal-card-body"><p><label class="label">Theme</label><div class="select"><select id="documenter-themepicker"><option value="auto">Automatic (OS)</option><option value="documenter-light">documenter-light</option><option value="documenter-dark">documenter-dark</option><option value="catppuccin-latte">catppuccin-latte</option><option value="catppuccin-frappe">catppuccin-frappe</option><option value="catppuccin-macchiato">catppuccin-macchiato</option><option value="catppuccin-mocha">catppuccin-mocha</option></select></div></p><hr/><p>This document was generated with <a href="https://github.com/JuliaDocs/Documenter.jl">Documenter.jl</a> version 1.5.0 on <span class="colophon-date" title="Friday 5 July 2024 15:08">Friday 5 July 2024</span>. Using Julia version 1.10.4.</p></section><footer class="modal-card-foot"></footer></div></div></div></body></html>
0 commit comments