Our full-web CAMM project at Makina Corpus has been going on for nearly two years and is running in production for over 18 months. I think it's my first project without any headache about our codebase and VCS management. So, I'll present our GIT workflow which has proven to be …
As several friends have asked me this, I have posted my simple but quite useful .gitconfig file. Nothing special here, just a few aliases and some syntax highlighting :).
Who is not tired of committing a "Remove pdb" or a "Fix a typo" few minutes or hours after committing a clean feature ? A few time ago, I discovered two useful options in GIT that work together : git commit --fixup and git rebase --autosquash. With these, you can easily merge …