I used to always have deep dread when having to use git but then I found [0]
Git rebase -i is not that scary
61–70 of 155 posts
Re: Git rebase -i is not that scary
#62I feel like if you're scared of rebasing, you don't actually understand git.
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.
Absolutely everything in computing needs to be 'understood' to be used.
Re: Git rebase -i is not that scary
#63I’ve used Git for 20 years now and wrote a book about it. The biggest mistake most sources make when teaching about history rewriting is omitting these two lessons first: - it’s easy to lose uncommitted data in Git and hard to lose committed data - given this, learn how to use ‘git reflog’ to see what you’ve done and how to undo/redo it (as this post recommends but, even then, a little too late) If you just get in th…
> it’s likely there forever and identifiable by that same hash from anywhere in the fork network
in case you are not aware of it already:
https://www.aikido.dev/blog/the-fork-awakens-why-githubs-inv...
Re: Git rebase -i is not that scary
#64A young dev who's still ambitious, gotta love it.
Re: Git rebase -i is not that scary
#65Earlier quoted context omitted.
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.
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 pl…
Give it an hour or two. It is really not that complicated. A little bit of investment will pay huge dividends. Do yourself the favor.
Re: Git rebase -i is not that scary
#66One additional thing I would mention ist that: When resolving conflicts never try to solve them for the final result. Consider each conflict without considering how the code will change in a later commit. I’ve seen people die a painful rebase death because of this.
Re: Git rebase -i is not that scary
#67One additional thing I would mention ist that: When resolving conflicts never try to solve them for the final result. Consider each conflict without considering how the code will change in a later commit. I’ve seen people die a painful rebase death because of this.
rerere
Re: Git rebase -i is not that scary
#68I feel like if you're scared of rebasing, you don't actually understand git.
When I interview someone and they are scared of `git rebase -i` it's a huge red flag.
Git rebase has such foundational data structures and concepts that you couldn't pass a serious college programming course without grokking it.
The only reason someone would be scared of git rebase is:
a) they don't know the basics of programming/software engineering
b) they are not intellectually curious enough to look into how tf the software they use every day works
Re: Git rebase -i is not that scary
#69I feel like if you're scared of rebasing, you don't actually understand git.
When I interview someone and they are scared of `git rebase -i` it's a huge red flag. Git rebase has such foundational data structures and concepts that you couldn't pass a serious college programming course without grokking it. The only reason someone would be scared of git rebase is: a) they don't know the basics of programming/software engineering b) they are not intellectually curious enough to look into how tf t…
I'm genuinely unsure why rebase interactive is more scary than rebase
Re: Git rebase -i is not that scary
#70I feel like if you're scared of rebasing, you don't actually understand git.
When I interview someone and they are scared of `git rebase -i` it's a huge red flag. Git rebase has such foundational data structures and concepts that you couldn't pass a serious college programming course without grokking it. The only reason someone would be scared of git rebase is: a) they don't know the basics of programming/software engineering b) they are not intellectually curious enough to look into how tf t…
An interviewer asking me about git rebase is the huge red flag