https://playground.christian-gmeiner.info/tags/fork/ Recent content in Fork on Christian Gmeiner https://playground.christian-gmeiner.info/papermod-cover.png https://playground.christian-gmeiner.info/papermod-cover.png Hugo -- 0.152.2 en-us Sat, 08 Feb 2014 09:37:49 +0000 https://playground.christian-gmeiner.info/2014-02-08-rebase-github-fork/ Sat, 08 Feb 2014 09:37:49 +0000 https://playground.christian-gmeiner.info/2014-02-08-rebase-github-fork/ <p>Today I needed to rebase my etnaviv fork to the current master of upstream. I need to say that I never did this before but with git this is a breeze.</p> <div class="oembed-gist"><script src="https://gist.github.com/austriancoder/724a0a8d1db4f229e197d501f8b49fa5.js"></script><noscript>View the code on [Gist](https://gist.github.com/austriancoder/724a0a8d1db4f229e197d501f8b49fa5).</noscript></div>If you get a merge conflict during rebase, you only need to follow the instructions git gives you.