updated slides
This commit is contained in:
parent
0f1aba21ce
commit
ee16a82965
|
|
@ -31,10 +31,9 @@ Use this when you are creating and working on your own projects.</p><pre class="
|
||||||
</span>git<span class="w"> </span>branch</pre><div class="notes"><p>Branches are parallel dossiers: safe space for changes.</p></div></div><div class="step step-level-1" step="31" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="49600" data-y="0" data-z="0"><h1 id="edit-the-page">Edit the page</h1><p>Edit the root index.html (and optionally add style.css, assets/).</p><p>Make a visible change first:</p><ul><li>Change the name to your name (or your alias)</li></ul><p>Then check changes:</p><pre class="highlight code bash">git<span class="w"> </span>diff<span class="w">
|
</span>git<span class="w"> </span>branch</pre><div class="notes"><p>Branches are parallel dossiers: safe space for changes.</p></div></div><div class="step step-level-1" step="31" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="49600" data-y="0" data-z="0"><h1 id="edit-the-page">Edit the page</h1><p>Edit the root index.html (and optionally add style.css, assets/).</p><p>Make a visible change first:</p><ul><li>Change the name to your name (or your alias)</li></ul><p>Then check changes:</p><pre class="highlight code bash">git<span class="w"> </span>diff<span class="w">
|
||||||
</span>git<span class="w"> </span>status</pre></div><div class="step step-level-1" step="32" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="51200" data-y="0" data-z="0"><h1 id="stage-commit-your-changes">Stage & commit your changes</h1><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>index.html<span class="w">
|
</span>git<span class="w"> </span>status</pre></div><div class="step step-level-1" step="32" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="51200" data-y="0" data-z="0"><h1 id="stage-commit-your-changes">Stage & commit your changes</h1><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>index.html<span class="w">
|
||||||
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Customize profile page for <your-slug>"</span></pre><p>If you added assets:</p><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>assets/<span class="w">
|
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Customize profile page for <your-slug>"</span></pre><p>If you added assets:</p><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>assets/<span class="w">
|
||||||
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Add assets for <your-slug>"</span></pre><div class="notes"><p>Small commits win. One change = one deposit.</p></div></div><div class="step step-level-1" step="33" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="52800" data-y="0" data-z="0"><h1 id="push-your-banch">Push your banch</h1><p>Push your commits to the server, defining a remote branch to track. This is called setting the upstream.</p><pre class="highlight code bash">git<span class="w"> </span>push<span class="w"> </span>-u<span class="w"> </span>origin<span class="w"> </span>braids/<your-slug></pre><p>(Again, change <your-slug>!)</p><p>The first time you checkout from <a href="https://git.hackersanddesigners.nl">https://git.hackersanddesigners.nl</a> the server will ask you for credentials. These will be remembered, so only once.
|
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Add assets for <your-slug>"</span></pre><div class="notes"><p>Small commits win. One change = one deposit.</p></div></div><div class="step step-level-1" step="33" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="52800" data-y="0" data-z="0"><h1 id="push-your-banch">Push your banch</h1><p>Push your commits to the server, defining a remote branch to track. This is called setting the upstream.</p><pre class="highlight code bash">git<span class="w"> </span>push<span class="w"> </span>-u<span class="w"> </span>origin<span class="w"> </span>braids/<your-slug></pre><p>(Again, change <your-slug>!)</p><p>This pushes your branch to the 'origin' server.</p><p>The first time you push to <a href="https://git.hackersanddesigners.nl">https://git.hackersanddesigners.nl</a> the server will ask you for credentials. These will be remembered, so only once.</p><p>From then on, unless the remote/branch is named, <tt>git push</tt> will go in that direction.</p><pre class="highlight code bash">git<span class="w"> </span>push</pre><div class="notes"><p>disabled push rights for now, only for demonstration purposes, will fail</p></div></div><div class="step step-level-1" step="34" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="54400" data-y="0" data-z="0"><h1 id="view-live">View live!</h1><p>Open the gallery:</p><ul><li><a href="https://braids.hackersanddesigners.nl/">https://braids.hackersanddesigners.nl/</a></li></ul><p>Find your card:</p><ul><li>braids/<your-slug>/</li></ul><p>Iterate:</p><p>edit -> status -> add -> commit -> push -> refresh</p></div><div class="step step-level-1" step="35" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="56000" data-y="0" data-z="0"><h1 id="common-problems-fast-fixes">Common problems (fast fixes)</h1><p>Wrong branch:</p><pre class="highlight code bash">git<span class="w"> </span>branch<span class="w">
|
||||||
This pushes your branch to the 'origin' server.</p><p>From then on, unless the remote/branch is named, <tt>git push</tt> will go in that direction.</p><pre class="highlight code bash">git<span class="w"> </span>push</pre><div class="notes"><p>disabled push rights for now, only for demonstration purposes, will fail</p></div><h1 id="view-ive">View ive!</h1><p>Open the gallery:</p><ul><li><a href="https://braids.hackersanddesigners.nl/">https://braids.hackersanddesigners.nl/</a></li></ul><p>Find your card:</p><ul><li>braids/<your-slug>/</li></ul><p>Iterate:</p><p>edit -> status -> add -> commit -> push -> refresh</p></div><div class="step step-level-1" step="34" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="54400" data-y="0" data-z="0"><h1 id="common-problems-fast-fixes">Common problems (fast fixes)</h1><p>Wrong branch:</p><pre class="highlight code bash">git<span class="w"> </span>branch<span class="w">
|
|
||||||
</span>git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug></pre><p>Nothing staged:</p><pre class="highlight code bash">git<span class="w"> </span>status<span class="w">
|
</span>git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug></pre><p>Nothing staged:</p><pre class="highlight code bash">git<span class="w"> </span>status<span class="w">
|
||||||
</span>git<span class="w"> </span>add<span class="w"> </span>index.html</pre><p>Push rejected (main protected):</p><ul><li>You are on main. Switch to your branch.</li></ul><p>Auth issues:</p><ul><li>HTTPS: check username/password</li></ul></div><div class="step step-level-1" step="35" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="56000" data-y="0" data-z="0"><h1 id="suggested-good-enough-commit-messages">Suggested “good enough” commit messages</h1><p>Bad:</p><ul><li>"update"</li><li>"stuff"</li><li>"changes"</li></ul><p>Better:</p><ul><li>"Add animated gif and profile link"</li><li>"Change background and typography"</li><li>"Fix broken image path"</li></ul><p>Rule: message should still make sense in 6 months.</p></div><div class="step step-level-1" step="36" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="57600" data-y="0" data-z="0"><h1 id="optional-git-pull">Optional: git pull</h1><p>Title underline too short.</p><pre class="highlight ">Optional: git pull
|
</span>git<span class="w"> </span>add<span class="w"> </span>index.html</pre><p>Push rejected (main protected):</p><ul><li>You are on main. Switch to your branch.</li></ul><p>Auth issues:</p><ul><li>HTTPS: check username/password</li></ul></div><div class="step step-level-1" step="36" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="57600" data-y="0" data-z="0"><h1 id="suggested-good-enough-commit-messages">Suggested “good enough” commit messages</h1><p>Bad:</p><ul><li>"update"</li><li>"stuff"</li><li>"changes"</li></ul><p>Better:</p><ul><li>"Add animated gif and profile link"</li><li>"Change background and typography"</li><li>"Fix broken image path"</li></ul><p>Rule: message should still make sense in 6 months.</p></div><div class="step step-level-1" step="37" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="59200" data-y="0" data-z="0"><h1 id="optional-git-pull">Optional: git pull</h1><p>Title underline too short.</p><pre class="highlight ">Optional: git pull
|
||||||
=================</pre><p>If you want to collaborate with others on the same branch, pull updates from server:</p><pre class="highlight code bash">git<span class="w"> </span>pull</pre><div class="notes"><p>During the exercise you mostly push your branch.
|
=================</pre><p>If you want to collaborate with others on the same branch, pull updates from server:</p><pre class="highlight code bash">git<span class="w"> </span>pull</pre><div class="notes"><p>During the exercise you mostly push your branch.
|
||||||
Pull is mainly for getting new changes on main (if needed).</p><p>fact: git pull is actually a git fetch && git merge</p></div></div><div class="step step-level-1" step="37" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="59200" data-y="0" data-z="0"><h1 id="optional-git-merge">Optional: git merge</h1><p>First, go ahead and <tt>git fetch --all</tt> branches from the remote git repository, so you have them locally.</p><p>Then <tt>git branch</tt> to see the available branches.</p><p>Check some of them out with <tt>git checkout braids/<branch_name></tt>.</p><p>See something you like? Merge with them.</p><pre class="highlight code bash">git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug><span class="w">
|
Pull is mainly for getting new changes on main (if needed).</p><p>fact: git pull is actually a git fetch && git merge</p></div></div><div class="step step-level-1" step="38" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="60800" data-y="0" data-z="0"><h1 id="optional-git-merge">Optional: git merge</h1><p>First, go ahead and <tt>git fetch --all</tt> branches from the remote git repository, so you have them locally.</p><p>Then <tt>git branch</tt> to see the available branches.</p><p>Check some of them out with <tt>git checkout braids/<branch_name></tt>.</p><p>See something you like? Merge with them.</p><pre class="highlight code bash">git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug><span class="w">
|
||||||
</span>git<span class="w"> </span>merge<span class="w"> </span>braids/<chosen_branch></pre><p>Consolidate any merge conflicts manually if you have to. Then, stage, commit and push your changes to your branch.</p></div><div class="step step-level-1" step="38" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="60800" data-y="0" data-z="0"><h1 id="optional-extension-if-time-remains">Optional extension (if time remains)</h1><ul><li>Compare two branches visually (gallery view)</li><li>Show git log to narrate your work as a documented process</li></ul></div><div class="step step-level-1" step="39" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="62400" data-y="0" data-z="0"><h1 id="wrap-up">Wrap-up</h1><p>Learn more:</p><ul><li><a href="https://learngitbranching.js.org/">Learn Git Branching</a></li><li><a href="https://ohmygit.org/">Oh My Git</a></li></ul><div class="notes"><p>End: remind participants their branches will be removed after the workshop.</p></div></div></div><script type="text/javascript" src="js/impress.js"></script><script type="text/javascript" src="js/gotoSlide.js"></script><script type="text/javascript" src="js/hovercraft.js"></script></body></html>
|
</span>git<span class="w"> </span>merge<span class="w"> </span>braids/<chosen_branch></pre><p>Consolidate any merge conflicts manually if you have to. Then, stage, commit and push your changes to your branch.</p></div><div class="step step-level-1" step="39" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="62400" data-y="0" data-z="0"><h1 id="optional-extension-if-time-remains">Optional extension (if time remains)</h1><ul><li>Compare two branches visually (gallery view)</li><li>Show git log to narrate your work as a documented process</li></ul></div><div class="step step-level-1" step="40" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="64000" data-y="0" data-z="0"><h1 id="wrap-up">Wrap-up</h1><p>Learn more:</p><ul><li><a href="https://learngitbranching.js.org/">Learn Git Branching</a></li><li><a href="https://ohmygit.org/">Oh My Git</a></li></ul><div class="notes"><p>End: remind participants their branches will be removed after the workshop.</p></div></div></div><script type="text/javascript" src="js/impress.js"></script><script type="text/javascript" src="js/gotoSlide.js"></script><script type="text/javascript" src="js/hovercraft.js"></script></body></html>
|
||||||
|
|
@ -31,10 +31,9 @@ Use this when you are creating and working on your own projects.</p><pre class="
|
||||||
</span>git<span class="w"> </span>branch</pre><div class="notes"><p>Branches are parallel dossiers: safe space for changes.</p></div></div><div class="step step-level-1" step="31" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="49600" data-y="0" data-z="0"><h1 id="edit-the-page">Edit the page</h1><p>Edit the root index.html (and optionally add style.css, assets/).</p><p>Make a visible change first:</p><ul><li>Change the name to your name (or your alias)</li></ul><p>Then check changes:</p><pre class="highlight code bash">git<span class="w"> </span>diff<span class="w">
|
</span>git<span class="w"> </span>branch</pre><div class="notes"><p>Branches are parallel dossiers: safe space for changes.</p></div></div><div class="step step-level-1" step="31" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="49600" data-y="0" data-z="0"><h1 id="edit-the-page">Edit the page</h1><p>Edit the root index.html (and optionally add style.css, assets/).</p><p>Make a visible change first:</p><ul><li>Change the name to your name (or your alias)</li></ul><p>Then check changes:</p><pre class="highlight code bash">git<span class="w"> </span>diff<span class="w">
|
||||||
</span>git<span class="w"> </span>status</pre></div><div class="step step-level-1" step="32" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="51200" data-y="0" data-z="0"><h1 id="stage-commit-your-changes">Stage & commit your changes</h1><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>index.html<span class="w">
|
</span>git<span class="w"> </span>status</pre></div><div class="step step-level-1" step="32" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="51200" data-y="0" data-z="0"><h1 id="stage-commit-your-changes">Stage & commit your changes</h1><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>index.html<span class="w">
|
||||||
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Customize profile page for <your-slug>"</span></pre><p>If you added assets:</p><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>assets/<span class="w">
|
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Customize profile page for <your-slug>"</span></pre><p>If you added assets:</p><pre class="highlight code bash">git<span class="w"> </span>add<span class="w"> </span>assets/<span class="w">
|
||||||
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Add assets for <your-slug>"</span></pre><div class="notes"><p>Small commits win. One change = one deposit.</p></div></div><div class="step step-level-1" step="33" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="52800" data-y="0" data-z="0"><h1 id="push-your-banch">Push your banch</h1><p>Push your commits to the server, defining a remote branch to track. This is called setting the upstream.</p><pre class="highlight code bash">git<span class="w"> </span>push<span class="w"> </span>-u<span class="w"> </span>origin<span class="w"> </span>braids/<your-slug></pre><p>(Again, change <your-slug>!)</p><p>The first time you checkout from <a href="https://git.hackersanddesigners.nl">https://git.hackersanddesigners.nl</a> the server will ask you for credentials. These will be remembered, so only once.
|
</span>git<span class="w"> </span>commit<span class="w"> </span>-m<span class="w"> </span><span class="s2">"Add assets for <your-slug>"</span></pre><div class="notes"><p>Small commits win. One change = one deposit.</p></div></div><div class="step step-level-1" step="33" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="52800" data-y="0" data-z="0"><h1 id="push-your-banch">Push your banch</h1><p>Push your commits to the server, defining a remote branch to track. This is called setting the upstream.</p><pre class="highlight code bash">git<span class="w"> </span>push<span class="w"> </span>-u<span class="w"> </span>origin<span class="w"> </span>braids/<your-slug></pre><p>(Again, change <your-slug>!)</p><p>This pushes your branch to the 'origin' server.</p><p>The first time you push to <a href="https://git.hackersanddesigners.nl">https://git.hackersanddesigners.nl</a> the server will ask you for credentials. These will be remembered, so only once.</p><p>From then on, unless the remote/branch is named, <tt>git push</tt> will go in that direction.</p><pre class="highlight code bash">git<span class="w"> </span>push</pre><div class="notes"><p>disabled push rights for now, only for demonstration purposes, will fail</p></div></div><div class="step step-level-1" step="34" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="54400" data-y="0" data-z="0"><h1 id="view-live">View live!</h1><p>Open the gallery:</p><ul><li><a href="https://braids.hackersanddesigners.nl/">https://braids.hackersanddesigners.nl/</a></li></ul><p>Find your card:</p><ul><li>braids/<your-slug>/</li></ul><p>Iterate:</p><p>edit -> status -> add -> commit -> push -> refresh</p></div><div class="step step-level-1" step="35" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="56000" data-y="0" data-z="0"><h1 id="common-problems-fast-fixes">Common problems (fast fixes)</h1><p>Wrong branch:</p><pre class="highlight code bash">git<span class="w"> </span>branch<span class="w">
|
||||||
This pushes your branch to the 'origin' server.</p><p>From then on, unless the remote/branch is named, <tt>git push</tt> will go in that direction.</p><pre class="highlight code bash">git<span class="w"> </span>push</pre><div class="notes"><p>disabled push rights for now, only for demonstration purposes, will fail</p></div><h1 id="view-ive">View ive!</h1><p>Open the gallery:</p><ul><li><a href="https://braids.hackersanddesigners.nl/">https://braids.hackersanddesigners.nl/</a></li></ul><p>Find your card:</p><ul><li>braids/<your-slug>/</li></ul><p>Iterate:</p><p>edit -> status -> add -> commit -> push -> refresh</p></div><div class="step step-level-1" step="34" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="54400" data-y="0" data-z="0"><h1 id="common-problems-fast-fixes">Common problems (fast fixes)</h1><p>Wrong branch:</p><pre class="highlight code bash">git<span class="w"> </span>branch<span class="w">
|
|
||||||
</span>git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug></pre><p>Nothing staged:</p><pre class="highlight code bash">git<span class="w"> </span>status<span class="w">
|
</span>git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug></pre><p>Nothing staged:</p><pre class="highlight code bash">git<span class="w"> </span>status<span class="w">
|
||||||
</span>git<span class="w"> </span>add<span class="w"> </span>index.html</pre><p>Push rejected (main protected):</p><ul><li>You are on main. Switch to your branch.</li></ul><p>Auth issues:</p><ul><li>HTTPS: check username/password</li></ul></div><div class="step step-level-1" step="35" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="56000" data-y="0" data-z="0"><h1 id="suggested-good-enough-commit-messages">Suggested “good enough” commit messages</h1><p>Bad:</p><ul><li>"update"</li><li>"stuff"</li><li>"changes"</li></ul><p>Better:</p><ul><li>"Add animated gif and profile link"</li><li>"Change background and typography"</li><li>"Fix broken image path"</li></ul><p>Rule: message should still make sense in 6 months.</p></div><div class="step step-level-1" step="36" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="57600" data-y="0" data-z="0"><h1 id="optional-git-pull">Optional: git pull</h1><p>Title underline too short.</p><pre class="highlight ">Optional: git pull
|
</span>git<span class="w"> </span>add<span class="w"> </span>index.html</pre><p>Push rejected (main protected):</p><ul><li>You are on main. Switch to your branch.</li></ul><p>Auth issues:</p><ul><li>HTTPS: check username/password</li></ul></div><div class="step step-level-1" step="36" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="57600" data-y="0" data-z="0"><h1 id="suggested-good-enough-commit-messages">Suggested “good enough” commit messages</h1><p>Bad:</p><ul><li>"update"</li><li>"stuff"</li><li>"changes"</li></ul><p>Better:</p><ul><li>"Add animated gif and profile link"</li><li>"Change background and typography"</li><li>"Fix broken image path"</li></ul><p>Rule: message should still make sense in 6 months.</p></div><div class="step step-level-1" step="37" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="59200" data-y="0" data-z="0"><h1 id="optional-git-pull">Optional: git pull</h1><p>Title underline too short.</p><pre class="highlight ">Optional: git pull
|
||||||
=================</pre><p>If you want to collaborate with others on the same branch, pull updates from server:</p><pre class="highlight code bash">git<span class="w"> </span>pull</pre><div class="notes"><p>During the exercise you mostly push your branch.
|
=================</pre><p>If you want to collaborate with others on the same branch, pull updates from server:</p><pre class="highlight code bash">git<span class="w"> </span>pull</pre><div class="notes"><p>During the exercise you mostly push your branch.
|
||||||
Pull is mainly for getting new changes on main (if needed).</p><p>fact: git pull is actually a git fetch && git merge</p></div></div><div class="step step-level-1" step="37" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="59200" data-y="0" data-z="0"><h1 id="optional-git-merge">Optional: git merge</h1><p>First, go ahead and <tt>git fetch --all</tt> branches from the remote git repository, so you have them locally.</p><p>Then <tt>git branch</tt> to see the available branches.</p><p>Check some of them out with <tt>git checkout braids/<branch_name></tt>.</p><p>See something you like? Merge with them.</p><pre class="highlight code bash">git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug><span class="w">
|
Pull is mainly for getting new changes on main (if needed).</p><p>fact: git pull is actually a git fetch && git merge</p></div></div><div class="step step-level-1" step="38" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="60800" data-y="0" data-z="0"><h1 id="optional-git-merge">Optional: git merge</h1><p>First, go ahead and <tt>git fetch --all</tt> branches from the remote git repository, so you have them locally.</p><p>Then <tt>git branch</tt> to see the available branches.</p><p>Check some of them out with <tt>git checkout braids/<branch_name></tt>.</p><p>See something you like? Merge with them.</p><pre class="highlight code bash">git<span class="w"> </span>checkout<span class="w"> </span>braids/<your-slug><span class="w">
|
||||||
</span>git<span class="w"> </span>merge<span class="w"> </span>braids/<chosen_branch></pre><p>Consolidate any merge conflicts manually if you have to. Then, stage, commit and push your changes to your branch.</p></div><div class="step step-level-1" step="38" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="60800" data-y="0" data-z="0"><h1 id="optional-extension-if-time-remains">Optional extension (if time remains)</h1><ul><li>Compare two branches visually (gallery view)</li><li>Show git log to narrate your work as a documented process</li></ul></div><div class="step step-level-1" step="39" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="62400" data-y="0" data-z="0"><h1 id="wrap-up">Wrap-up</h1><p>Learn more:</p><ul><li><a href="https://learngitbranching.js.org/">Learn Git Branching</a></li><li><a href="https://ohmygit.org/">Oh My Git</a></li></ul><div class="notes"><p>End: remind participants their branches will be removed after the workshop.</p></div></div></div><script type="text/javascript" src="js/impress.js"></script><script type="text/javascript" src="js/gotoSlide.js"></script><script type="text/javascript" src="js/hovercraft.js"></script></body></html>
|
</span>git<span class="w"> </span>merge<span class="w"> </span>braids/<chosen_branch></pre><p>Consolidate any merge conflicts manually if you have to. Then, stage, commit and push your changes to your branch.</p></div><div class="step step-level-1" step="39" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="62400" data-y="0" data-z="0"><h1 id="optional-extension-if-time-remains">Optional extension (if time remains)</h1><ul><li>Compare two branches visually (gallery view)</li><li>Show git log to narrate your work as a documented process</li></ul></div><div class="step step-level-1" step="40" data-rotate-x="0" data-rotate-y="0" data-rotate-z="0" data-scale="1" data-x="64000" data-y="0" data-z="0"><h1 id="wrap-up">Wrap-up</h1><p>Learn more:</p><ul><li><a href="https://learngitbranching.js.org/">Learn Git Branching</a></li><li><a href="https://ohmygit.org/">Oh My Git</a></li></ul><div class="notes"><p>End: remind participants their branches will be removed after the workshop.</p></div></div></div><script type="text/javascript" src="js/impress.js"></script><script type="text/javascript" src="js/gotoSlide.js"></script><script type="text/javascript" src="js/hovercraft.js"></script></body></html>
|
||||||
|
|
@ -714,9 +714,10 @@ Push your commits to the server, defining a remote branch to track. This is call
|
||||||
|
|
||||||
(Again, change <your-slug>!)
|
(Again, change <your-slug>!)
|
||||||
|
|
||||||
The first time you checkout from https://git.hackersanddesigners.nl the server will ask you for credentials. These will be remembered, so only once.
|
|
||||||
This pushes your branch to the 'origin' server.
|
This pushes your branch to the 'origin' server.
|
||||||
|
|
||||||
|
The first time you push to https://git.hackersanddesigners.nl the server will ask you for credentials. These will be remembered, so only once.
|
||||||
|
|
||||||
From then on, unless the remote/branch is named, ``git push`` will go in that direction.
|
From then on, unless the remote/branch is named, ``git push`` will go in that direction.
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
@ -728,8 +729,9 @@ From then on, unless the remote/branch is named, ``git push`` will go in that di
|
||||||
|
|
||||||
disabled push rights for now, only for demonstration purposes, will fail
|
disabled push rights for now, only for demonstration purposes, will fail
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
View ive!
|
View live!
|
||||||
============================
|
============================
|
||||||
|
|
||||||
Open the gallery:
|
Open the gallery:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue