Git is actually unusable software. Fucking around with rebase WILL cause you more headaches than this is worth.
The number of downvotes this has received tells me just how deluded the alleged community of software writers actually is.
The number of downvotes this has received tells me just how deluded the alleged community of software writers actually is.
At my last job we had about 40 devs in India spread out in different cities. We re-wrote much of Android and our Git repos were massive. This meant devs needed a local repo and couldn't be expected to work with a remote other than commits. Only once with all these random developers did history become a mess and we had to rebase and clean things up. I think a lot of people fail to understand how to implement Git properly and are making it overly complicated for daily use.
The majority of companies you've interacted with use Git.
I'm guessing you're in the web development sphere. If you were in the game development sphere or the large-company sphere, things might look very different to you.
Look, I like git, I use it for my personal projects. But I'm also watching the company I work for transition to it, and I've watched people use it in past jobs, and I can tell you that I've seen a lot of smart engineers become entirely frustrated with that system.
At the moment we're on perforce, and while I think git is objectively better than perforce, we have a lot of engineers that are completely happy with perforce and are annoyed with the transition. And you know what? I can't blame them. Git does a lot of things better, but not necessarily things that make these peoples day to day life easier, and they've (correctly) concluded that this transition is going to require them to learn something difficult that won't really give them any direct benefit.
The idea that git is universal I think comes from the success of github. And more power to them, it's great. But while git is fantastic for open source projects, it's not universally perfect in every context. It's really really hard to use, and if you don't need any of the benefits that a DVCS provides it's not irrational to conclude it may not be for you.
My git workflow is pull, commit, push. I don't rebase or branch or anything else because it completely distracts me from what I'm doing as a developer. YMMV.
> The problem is, are we developers or source code librarians?
One might, perhaps, be forgiven for thinking a professional would be interested in both.
Are there any other things you consider outside your job description?