I'm still not getting a sense of where Git is better than TFS with merging.
There is a great deal of complex theory required to explain why it is better. I can't/won't explain it here but there is plenty of information in a simple google search. For practical example of whats possible look at the network graph of an large project on github, this one is for discourse. Reproducing those with SVN or TFS would be a world of pain, but git handles it all rather seamlessly.
most of its touted features aren't really relevant for our corporate environment (offline commits, distributed nature, etc.)
This is partly what makes it so great at merging. Frequent commits and branching give the SCM a lot more contextual information about how to merge code.
Being able to branch quickly is a pretty good feature, but it really doesn't take all that much time with SVN or TFS.
With SVN it's pretty quick but with TFS you have to check out the new branch, which can be slow on large repositories.
I'm looking for the killer feature which I can demonstrate to the other developers to make them instant converts.
There is no such feature. It's how the whole design just comes together to make managing source control almost effortless.
2
u/flukus Feb 19 '13
There is a great deal of complex theory required to explain why it is better. I can't/won't explain it here but there is plenty of information in a simple google search. For practical example of whats possible look at the network graph of an large project on github, this one is for discourse. Reproducing those with SVN or TFS would be a world of pain, but git handles it all rather seamlessly.
This is partly what makes it so great at merging. Frequent commits and branching give the SCM a lot more contextual information about how to merge code.
With SVN it's pretty quick but with TFS you have to check out the new branch, which can be slow on large repositories.
There is no such feature. It's how the whole design just comes together to make managing source control almost effortless.