• Commit to local • Push to remote • Branches are references • master • Central repository • Sequential commit #s • Commit to remote ! • Branches are directories • trunk
for each commit that gets replayed • Cleaner history • Requires a force-push, replacing history • Merge • One big merge conflict • Many merge commits into your branch