I thought it was just me who has a hard time with git. I feel better now.
You just helped me so fucking much with this! I’m writing a lecture on exactly this and my own personal experience is alright, but this is even better. Thank you!
Happy to help, this web has saved me from many fuck ups though the years and everyone should know about it
i could have used this 10 years ago; but i guess it’s better late than never. lol
lazygit ftw
Use a rebase.
Rebase still means you have to resolve conflicts, but it can be worse because you may have to resolve conflicts across multiple commits that you’re rebasing on top of a conflict.
Do you know our Lord and Savior rerere?
(Though I rather squash most of the times)
Damn, you know… Over 15 years as a dev using git and understanding it fairly well and I’m still learning about new, handy things.
In my experience this can be beneficial when committing and rebasing small and distinct changes.
Agreed. If your commits are reasonably structured, rebasing is far more helpful.
Although these days I usually opt for one ball-of-mud commit while developing the code, which is always fairly trivial to rebase - only one commit, can’t have follow-up issues - and then I redo the commit structure from scratch as a part of preparing the code for the benefit of the reviewer.
Yep, Ive hat that one.
Sometimes it happens to me and git is as cantankerous with me as Linus is to a kernel developer that irked him.
AI tools are actually really helpful with this kind of stuff. Not with actually resolving the conflict, but with setting things up so that you can see and reason about it.
