Daily Shaarli

If you’ve got a table saw, here’s a new way to put it to work: making cabinet doors. You don’t need any special jigs— just your saw, large or small, a miter gauge and a sharp blade. And you don’t need any specially prepared wood; material from a home center will be fine.

Grumpy calves can also lead to pain in other parts of the body. For example, poor calf mobility may lead to knee and ankle pain, shin splints, plantar fasciitis, Achilles tendonitis, and even back issues.

So you've finished your work and are ready to merge your branch back into master. Here's one way to do that very cleanly and safely:
<pre>
git checkout master
git fetch --prune
git merge --ff-only origin/master
git rebase master my-awesome-feature-1234
git push --force-with-lease origin my-awesome-feature-1234
git checkout master
git merge --no-ff my-awesome-feature-1234
git push origin master
</pre>
You'll remember that, right? And you'll never mess it up?
For us, we simply run:
<pre>
git merge-with-master
</pre>