1) "pull --rebase" might help with one of the particular problems mentioned (though obv. not appropriate for all occasions) 2) More broadly: yeah, if you expec

1) "pull --rebase" might help with one of the particular problems mentioned (though obv. not appropriate for all occasions) 2) More broadly: yeah, if you expect it to work Just Like Things You Already Know, it just won't work out for you. It really is a totally different workflow, and it either works for you, or it doesn't. Empirically, it works great for many people/organizations (though, absolutely, not without some trade-offs). But truthfully, yeah, if you're a single developer, disinclined to use some of the niceties and very interested in maximizing simplicity/reducing keystrokes... svn really may be a better fit.