git

Best practice says we shouldn’t be committing vendor, core or contrib projects to a repo, (see https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-...)

As a result I have had to go through the process of removing the files on several sites.
This can be done by running:

I have been using git merge quite a lot at work as a part of the my workflow, because the powers that be outlined how we should be working prior to deployment, but it means that looking at the history in a graphical tool you get a messy web of branches, so I asked the question
"Should we be using rebase more in our workflow?"

Here are some of the arguments for rebase:

The Case for Git Rebase

I really liked this webinar from Atlassian which contains a special mention of using git with Jira and Jenkins for continuous integration (CI), all of which I use at work, bonus.
http://www.youtube.com/watch?v=9SZ7kSQ2424
Utopia == A seperate build for each branch and automated testing with CI.

I listened to this podcast recently and found the chat about workflows really interesting, especially relevant is the chat about git/jenkins/jira automatically coming together and might be worth looking into:
http://www.lullabot.com/blog/podcasts/workflow-uh-what-it-good