Hey there @overflowing
Between me and the other world there is ever an unasked question: unasked by...– W.E.B. DU BOIS, The Soul of Black Folk
kevin asked: At my company we use "git pull --rebase" and while I can't tell you exactly what's happening it somehow takes care of the merge and keeps things running smooth. It helps when resolving conflicts as well.
Quick git tip: fetch and merge, don’t pull “The problem with git pull is that it has all kinds of helpful magic. That means you don’t really have to learn about the different types of branch in git.” (via Mark’s Blog)
In the southern Hebron hills of the West Bank, there is plenty of electricity...– NICHOLAS D. KRISTOF (NYT) The Two Sides of a Barbed-Wire Fence