feed.xml

<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.2">Jekyll</generator><link href="https://walter76.github.io/feed.xml" rel="self" type="application/atom+xml" /><link href="https://walter76.github.io/" rel="alternate" type="text/html" /><updated>2018-05-21T23:09:59+02:00</updated><id>https://walter76.github.io/</id><title type="html">The Chaotic Heap</title><subtitle>A unstructured collection of posts around software development and architecture.</subtitle><author><name>Walter</name><email>walter.stocker@gmx.de</email></author><entry><title type="html">How to Set-up a Vagrant box for Jekyll</title><link href="https://walter76.github.io/vagrant/jekyll/vagrant-box-for-jekyll/" rel="alternate" type="text/html" title="How to Set-up a Vagrant box for Jekyll" /><published>2018-03-21T07:24:01+01:00</published><updated>2018-03-21T07:24:01+01:00</updated><id>https://walter76.github.io/vagrant/jekyll/vagrant-box-for-jekyll</id><content type="html" xml:base="https://walter76.github.io/vagrant/jekyll/vagrant-box-for-jekyll/">&lt;h1 id=&quot;prerequisites&quot;&gt;Prerequisites&lt;/h1&gt;

&lt;p&gt;First I had to install the most up-to-date versions of &lt;a href=&quot;https://www.virtualbox.org/&quot;&gt;Virtual Box&lt;/a&gt; and
&lt;a href=&quot;https://www.vagrantup.com/&quot;&gt;Vagrant&lt;/a&gt; on my Laptop. Virtual Box is used by Vagrant for the Virtual Machines. In addition
also a version of PowerShell &amp;gt; 2 is needed. If you are using Windows 10, you should already have it installed. As my
Laptop still runs on Windows 7, I had to install the &lt;a href=&quot;https://docs.microsoft.com/en-us/powershell/wmf/5.1/install-configure&quot;&gt;Windows Management Framework v5.1&lt;/a&gt;. After some reboots&lt;/p&gt;

&lt;p&gt;vagrant init jadesystems/rails5
vagrant up
vagrant ssh&lt;/p&gt;

&lt;p&gt;vagrant suspend
vagrant halt
vagrant destroy&lt;/p&gt;

&lt;p&gt;sudo apt-get update
sudo apt-get upgrade&lt;/p&gt;

&lt;p&gt;Select /dev/sda1 /boot for grub?!&lt;/p&gt;

&lt;p&gt;sudo gem install bundler
sudo apt-get install libffi-dev
sudo apt-get install libcurl4-openssl-dev
https://kvz.io/blog/2013/01/16/vagrant-tip-keep-virtualbox-guest-additions-in-sync/
https://stackoverflow.com/questions/23840098/empty-reply-from-server-cant-connect-to-vagrant-vm-w-port-forwarding&lt;/p&gt;

&lt;p&gt;bundle exec jekyll serve –force_polling –port 8090 –host 0.0.0.0&lt;/p&gt;</content><author><name>Walter</name><email>walter.stocker@gmx.de</email></author><summary type="html">Prerequisites First I had to install the most up-to-date versions of Virtual Box and Vagrant on my Laptop. Virtual Box is used by Vagrant for the Virtual Machines. In addition also a version of PowerShell &amp;gt; 2 is needed. If you are using Windows 10, you should already have it installed. As my Laptop still runs on Windows 7, I had to install the Windows Management Framework v5.1. After some reboots vagrant init jadesystems/rails5 vagrant up vagrant ssh vagrant suspend vagrant halt vagrant destroy sudo apt-get update sudo apt-get upgrade Select /dev/sda1 /boot for grub?! sudo gem install bundler sudo apt-get install libffi-dev sudo apt-get install libcurl4-openssl-dev https://kvz.io/blog/2013/01/16/vagrant-tip-keep-virtualbox-guest-additions-in-sync/ https://stackoverflow.com/questions/23840098/empty-reply-from-server-cant-connect-to-vagrant-vm-w-port-forwarding bundle exec jekyll serve –force_polling –port 8090 –host 0.0.0.0</summary></entry><entry><title type="html">How to Work on a Branch with GitHub</title><link href="https://walter76.github.io/git/how-to-work-on-a-branch-with-github/" rel="alternate" type="text/html" title="How to Work on a Branch with GitHub" /><published>2018-02-20T23:09:01+01:00</published><updated>2018-02-20T23:09:01+01:00</updated><id>https://walter76.github.io/git/how-to-work-on-a-branch-with-github</id><content type="html" xml:base="https://walter76.github.io/git/how-to-work-on-a-branch-with-github/">&lt;p&gt;In this post I will show how to create a branch if your repository is on GitHub
and what you have to do to synchronize it with your local repository.&lt;/p&gt;

&lt;h2 id=&quot;create-the-remote-branch-on-github&quot;&gt;Create the Remote Branch on GitHub&lt;/h2&gt;

&lt;p&gt;First you need to create a remote branch on GitHub. This branch is afterwards
used to synchronize with your local repository.&lt;/p&gt;

&lt;p&gt;Go to GitHub and open the repository that you would like to create the branch.
In the first tab you can switch between branches and there is also the place
where you can create a new one.&lt;/p&gt;

&lt;p&gt;&lt;img src=&quot;https://walter76.github.io/assets/github-create-branch.png&quot; alt=&quot;Create a Branch on GitHub&quot; /&gt;&lt;/p&gt;

&lt;p&gt;Enter a branch name in the field, e.g. some-fix, and hit enter. The branch will
be created from your current branch.&lt;/p&gt;

&lt;h2 id=&quot;create-a-branch-in-your-local-repository&quot;&gt;Create a Branch in Your Local Repository&lt;/h2&gt;

&lt;p&gt;Now you need a branch in your local repository. This branch is created by
&lt;code class=&quot;highlighter-rouge&quot;&gt;git checkout -b some-fix&lt;/code&gt;.&lt;/p&gt;

&lt;p&gt;&lt;img src=&quot;https://walter76.github.io/assets/git-create-branch-locally.png&quot; alt=&quot;Create a Branch in Local Repository&quot; /&gt;&lt;/p&gt;

&lt;h2 id=&quot;set-the-remote-branch-as-upstream-branch&quot;&gt;Set the Remote Branch as Upstream Branch&lt;/h2&gt;

&lt;p&gt;Now we need to tell git that we would like to synchronize this branch with the
branch on GitHub. This is done by setting the remote branch as upstream branch.
You can do this with &lt;code class=&quot;highlighter-rouge&quot;&gt;git branch --set-upstream-to=origin/source source&lt;/code&gt;. You
can now use git pull/push to synchronize your work.&lt;/p&gt;

&lt;p&gt;You can also pull/push the remote branch with &lt;code class=&quot;highlighter-rouge&quot;&gt;git pull origin source&lt;/code&gt;&lt;/p&gt;

&lt;h2 id=&quot;switch-branches&quot;&gt;Switch Branches&lt;/h2&gt;

&lt;p&gt;You can switch branches locally with &lt;code class=&quot;highlighter-rouge&quot;&gt;git checkout &amp;lt;branch&amp;gt;&lt;/code&gt;. If you want to
switch to a new branch and create it automatically use
&lt;code class=&quot;highlighter-rouge&quot;&gt;git checkout -b &amp;lt;branch&amp;gt;&lt;/code&gt;.&lt;/p&gt;

&lt;h2 id=&quot;list-branches&quot;&gt;List Branches&lt;/h2&gt;

&lt;p&gt;You can list all your branches with &lt;code class=&quot;highlighter-rouge&quot;&gt;git branch -v&lt;/code&gt;.&lt;/p&gt;

&lt;h2 id=&quot;create-branches&quot;&gt;Create Branches&lt;/h2&gt;

&lt;p&gt;Branches are created with &lt;code class=&quot;highlighter-rouge&quot;&gt;git branch &amp;lt;branch&amp;gt;&lt;/code&gt;.&lt;/p&gt;

&lt;h2 id=&quot;delete-branches&quot;&gt;Delete Branches&lt;/h2&gt;

&lt;p&gt;After you have finished working on that branch it is time to remove it. You can
do this with &lt;code class=&quot;highlighter-rouge&quot;&gt;git branch -d &amp;lt;branch&amp;gt;&lt;/code&gt;.&lt;/p&gt;

&lt;h2 id=&quot;merge-branches&quot;&gt;Merge Branches&lt;/h2&gt;

&lt;p&gt;Before deleting a branch you might want to merge your work to another branch,
e.g. master. You can do the following:&lt;/p&gt;

&lt;div class=&quot;highlighter-rouge&quot;&gt;&lt;div class=&quot;highlight&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;git checkout master
git merge some-fix
&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/div&gt;</content><author><name>Walter</name><email>walter.stocker@gmx.de</email></author><summary type="html">In this post I will show how to create a branch if your repository is on GitHub and what you have to do to synchronize it with your local repository.</summary></entry></feed>