“Between me and the other world there is ever an unasked question: unasked by some through feelings of delicacy; by others through the difficulty of rightly framing it. All, nevertheless, flutter round it. They approach me in a half-hesitant sort of way, eye me curiously or compassionately, and then, instead of saying directly, How does it feel to be a problem? they say, I know an excellent colored man in my town; or, I fought at Mechanicsville; or, Do not these Southern outrages make your blood boil? At these I smile, or am interested, or reduce the boiling to a simmer, as the occasion may require. To the real question, How does it feel to be a problem? I answer seldom a word.”—W.E.B. DU BOIS, The Soul of Black Folk
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.
I’m just starting with git and just using it to update my emacs configuration folder which is a fork of the emacs-starter-kit on github.
It is tad of an overkill, but I enjoy learning about the world of VCS.
“In the southern Hebron hills of the West Bank, there is plenty of electricity and water for chickens and farms, but not for Palestinians.”—NICHOLAS D. KRISTOF (NYT) The Two Sides of a Barbed-Wire Fence