[Plone-conference] A tip about working with git at sprints

[David Glick]

In thanks for your gittips, here is a "git tip" for you:
When we have sprints and lots of people are working on the same package 
at once, the git commit log tends to get cluttered with lots of merge 
commits that look like "Merge branch 'master' into ploneconf2012". This 
happens because while you were making your commit, someone else already 
pushed a new one to github, so when you pull git makes a new commit to 
merge the two changes.

Instead of doing "git pull," you can do "git pull --rebase". This will 
make git redo your commit(s) after the one(s) that happened on github, 
so that no additional merge commit is necessary unless something conflicts.

See you all tomorrow...er, later today...
David