I feel like if you're scared of rebasing, you don't actually understand git.

Glyptodon 3 hours ago | parent | next [-]

My fear has never been rebasing itself, but that I make some kind of mistake with a random change conflict and don't notice it because it's not tested for directly. But I'm also not sure if that's categorically a git fear. (Edit: related to this, I think this sort of minor "itchy worry" is grounded in how sometimes conceptually simple diffs look messy during conflict resolution.)

	▲	hetman 2 hours ago \| parent [-]
		If all I'm doing with git rebase is reorganising my commits, and I have to deal with conflicts, after I'm done, I always git diff my pre-rebase head with post rebase head commit hash. I can quickly see I've messed something up if the diff isn't empty. For more complex tasks it's best to leave the rearranging until last, but where not possible, the diff is still pretty useful to double check my work.

▲

jerf 3 hours ago | parent | prev | next [-]

Reflog is, as the article says, the permission to do all kinds of crazy things, including rebasing. Once you realize any committed state is recoverable for a good period of time it really frees you.

Plus you can always take a note of the commit hash before you do anything crazy. But reflog means you don't have to.

Git really does have all the features you need. I wouldn't argue with anyone complaining about the UI to get there. But it's all in there somewhere.

▲

irishcoffee 3 hours ago | parent | prev | next [-]

The part where git needs to be “understood” is the entire problem. “Do one thing and do it well” was the whole mantra, which was completely ignored with the disaster that is git. It’s objectively awful.

▲

teaearlgraycold an hour ago | parent | next [-]

It could be so much better. At the same time, it’s one of the core tools for a developer. You’ll learn it eventually. You’re going to be using version control for decades. I’ve met devs many years into their careers who don’t understand rebase. It’s like going to a metal shop and they’re complaining about the learning curve on their welder and half the tradesmen are still at a novice level.

	▲	LAC-Tech an hour ago \| parent \| next [-]
		I still don't know it very well, and it's been well over a decade. I think it's a combination of a few things: - I find it uninteresting. My version control needs are very simple. - Most teams I have been in use a small subset of it. - It's confusing terms and inconsistent cli are huge warning signs to not go down that rabbithole. Today instead of learning Git I read some Tony Hoare, much better. I've been at once place where they rebased, and it was awful. Complete waste of time. (great place otherwise though)
	▲	rdevilla an hour ago \| parent \| prev [-]
		[dead]

▲

LAC-Tech an hour ago | parent | prev [-]

yeah I would really love to see a subset of git with a sane cli. would switch in a heartbeat.

▲

LAC-Tech an hour ago | parent | prev [-]

Correct on both counts.