[kevin_thibedeau]

Reminds me of someone who refused to use revision control because "merges were unreliable". Of course they are when you wait 30 days between commits.

[pcthrowaway]

Git noob question here (but someone who has been working on that noobishness for a year now): Can't you just rebase the branch you're on before trying to merge to another branch?

[codeonfire]

Rebasing is similar to merging. Instead of merging their code after your code, you are merging your code after their code. So if the two versions modify the same code fifty commits apart you'll have conflicts in both cases.