Jekyll2022-09-13T13:20:27+01:00https://tiborauer.github.io/feed.xmlTibor AuerTibor Auer is a research fellow at the University of Surrey in Guildford. His research interests include brain dynamics in short and long term, as well as developing approaches and tools to facilitate adoption of best practices.Tibor AuerRain2021-02-18T12:40:00+00:002021-02-18T12:40:00+00:00https://tiborauer.github.io/blog/2021/02/18/welcome-to-rain<h3 id="rain">Rain</h3>
<p>Crying angels<br />
on celestial pillows<br />
are writing dreams<br />
with their clear tears;<br />
and sending them<br />
– if they can –<br />
down from the Heaven.</p>
<p>Some gets cold<br />
from it.<br />
Some gets soaked<br />
from it.<br />
And, hopefully, somewhere<br />
this Celestial Water<br />
runs down to the heart<br />
of a faithful prayer.</p>
<p>The feathery drops<br />
are caressing,<br />
guiding us<br />
to cleansing<br />
for a new Spring<br />
when the new Wind<br />
whistling through our Soul<br />
provoke a sing.</p>
<p>All the sorrow<br />
has gone with the Wind.<br />
All the pain<br />
is running from it;<br />
and from the Rain<br />
turning the spoil<br />
into living soil<br />
for the sprouting Grain.</p>
<p>Flying angels<br />
– like wind from a willow –<br />
leave the Safe.<br />
The Water-bearers<br />
carry<br />
– pure and shiny –<br />
The Dream of the Brave.</p>Tibor AuerRainGit Recipes - Collaboration2021-02-09T20:40:00+00:002021-02-09T20:40:00+00:00https://tiborauer.github.io/blog/2021/02/09/git-recipes-collab<h1 id="keys">Keys</h1>
<table>
<thead>
<tr>
<th>Key or symbol</th>
<th>Interpretation</th>
</tr>
</thead>
<tbody>
<tr>
<td><…></td>
<td>Placeholder with possible formatting hints. You can use whatever name you want or appropriate, however, the same placeholder corresponds to the same item in this document.</td>
</tr>
<tr>
<td>project</td>
<td>Centrally stored (e.g. on GitHub/GitLab), collectively developped repository you have forked.</td>
</tr>
<tr>
<td>default</td>
<td>The main branch of the <em>project</em>. It is usually called <code class="language-plaintext highlighter-rouge">master</code>.</td>
</tr>
<tr>
<td>local</td>
<td>A copy of a fork of the <em>project</em> on your computer obtained via <a href="https://www.atlassian.com/git/tutorials/setting-up-a-repository/git-clone">git clone</a>.</td>
</tr>
<tr>
<td>feature</td>
<td>Certain coding task, e.g. recitifying an issue or enhancing/adding functionality to the <em>project</em>.</td>
</tr>
<tr>
<td>remoterepository</td>
<td>Link to another fork of the <em>project</em> via <a href="https://www.atlassian.com/git/tutorials/syncing">git remote</a>.</td>
</tr>
<tr>
<td>remoteuser</td>
<td>Another user also developping the <em>project</em> through his/her fork.</td>
</tr>
<tr>
<td>remotebranch</td>
<td>A branch in the <em>remotuser</em>’s repository.</td>
</tr>
<tr>
<td>review</td>
<td>Evaluate and modify a pull request (if needed).</td>
</tr>
</tbody>
</table>
<h1 id="use-cases">Use cases</h1>
<h2 id="add-link-to-another-fork-repository">Add link to another fork repository</h2>
<p>Linking forks to your local repository allows you to pull commits from or push to that fork stored on GitHub/GitLab. When you clone a repository, the link <code class="language-plaintext highlighter-rouge">original</code> is created automatically. Sometimes, you may want to add further links for the use cases mentioned below.</p>
<h4 id="you-can-add-link-to-the-project">You can add link to the project:</h4>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git remote add <project> <https://github.com/group/project.git>
git remote update
</code></pre></div></div>
<h4 id="you-can-also-add-link-to-another-fork-of-the-project">You can also add link to another fork of the project:</h4>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git remote add <remoteuser> <https://github.com/remoteuser/project.git>
git remote update
</code></pre></div></div>
<h2 id="extend-the-project-with-a-feature">Extend the project with a feature</h2>
<ol>
<li>Make sure that there is a <a href="#you-can-add-link-to-the-project">link to the <em>project</em></a></li>
<li>Create a new local branch based on the <em>default</em> branch of the project to collect commits for the <em>feature</em>
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout <span class="nt">-b</span> <feature> <project>/<default>
</code></pre></div> </div>
</li>
<li>Edit and <a href="https://www.atlassian.com/git/tutorials/saving-changes/git-commit">commit</a></li>
<li><a href="https://www.atlassian.com/git/tutorials/syncing/git-push">Push</a> the <em>feature</em> branch to your fork
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git push <span class="nt">-u</span> origin <feature>
</code></pre></div> </div>
</li>
<li>Create pull request from <em>feature</em> branch of your fork to <em>defaut</em> branch of the <em>project</em></li>
</ol>
<h2 id="review-pull-request">Review pull request</h2>
<p>Reviewing pull requests is an essential part of collaboration. Here you download the updated code, test it, and send recommendations to the submitter so that (s)he can incorporate them into his/her repository (and automatically the pull request, as well).</p>
<ol>
<li>Make sure that there is a <a href="#you-can-also-add-link-to-another-fork-of-the-project">link to the <em>remoteuser</em>’s fork of project</a></li>
<li>Retrieve the pull request by checking out the <em>remotebranch</em> from where the PR had been submitted
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git checkout <span class="nt">-b</span> <review> <remoteuser>/<remotebranch>
</code></pre></div> </div>
</li>
<li>Edit, <a href="https://www.atlassian.com/git/tutorials/saving-changes/git-commit">commit</a>, and <a href="https://www.atlassian.com/git/tutorials/syncing/git-push">push</a> the <em>review</em> branch to your fork
<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git push <span class="nt">-u</span> origin <review>
</code></pre></div> </div>
</li>
<li>Create pull request from <em>review</em> branch of your fork to <em>remotebranch</em> of the <em>remoteuser</em>/<em>project</em></li>
</ol>Tibor AuerKeys