1,975 karma · joined December 17, 2011
However, the article is mostly about finishing projects, which is harder to do: e.g., staying motivated, finding time, not getting too distracted with other projects that nothing ever lands.
If we want simplicity, then why not make sure it is a subset of YAML?
There is a lot they could do.
Also, in the example, it may be that the employees griping about Bob are not even going to try to notify him.
I agree with you that this requires an organized manager. Unfortunately, a ton of managers lack this kind of organization.
The pain here is not because git is inherently harder, but because you'd gotten used to svn (including your conflict workaround) and I guess nobody wants to do the same learning for git.
Having a local repo and push/pull to any other repo is not a complication but a huge advantage. It lets you do things like commit while you are on an airplane, or share committed work in an internal team before pushing to trunk, or keep repo history even if the server dies in a fire. It lets you not have to worry about who can be trusted with commit permissions or not. Being able to commit all the time without pushing lets you keep revision history without checking in, so you don't end up with many copies of your working directories, or saving up changes before you are 'allowed' to commit.
Since you can commit all the time, you can destroy the working tree trying things out and then bring it back if they didn't work.
So let's not complain about having a working tree, local repo, or remote repo. The staging area makes it so that you don't have to complete all staging of many different files in one huge command. You can add/rm something, preview what's staged, and only commit when you are satisfied.
In addition, CVS type merge is a pain while it is actually much simpler with git or hg. And being able to keep rebasing your private feature branch on a changing remote branch is a huge improvement.
let g:ctrlp_clear_cache_on_exit=0