▲ 262 ▼ When you screw up git (lemmy.zip) submitted 1 year ago by ericheese@lemmy.zip to c/programmerhumor@lemmy.ml 16 comments fedilink hide all child comments
[–] GissaMittJobb@lemmy.ml 7 points 1 year ago (5 children) Use a rebase. permalink fedilink source hideshow 5 child comments replies: [–] chaospatterns@lemmy.world 8 points 1 year ago (4 children) 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. permalink fedilink source parent hideshow 4 child comments replies: [–] SavinDWhales@lemmy.world 8 points 1 year ago (1 child) Do you know our Lord and Savior rerere? (Though I rather squash most of the times) permalink fedilink source parent hideshow 1 child comment replies: [–] bungle_in_the_jungle@lemmy.world 5 points 1 year ago 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. permalink fedilink source parent [–] ChaosMonkey@lemmy.dbzer0.com 3 points 1 year ago* (1 child) In my experience this can be beneficial when committing and rebasing small and distinct changes. permalink fedilink source parent hideshow 1 child comment replies: [–] GissaMittJobb@lemmy.ml 2 points 1 year ago 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. permalink fedilink source parent
[–] chaospatterns@lemmy.world 8 points 1 year ago (4 children) 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. permalink fedilink source parent hideshow 4 child comments replies: [–] SavinDWhales@lemmy.world 8 points 1 year ago (1 child) Do you know our Lord and Savior rerere? (Though I rather squash most of the times) permalink fedilink source parent hideshow 1 child comment replies: [–] bungle_in_the_jungle@lemmy.world 5 points 1 year ago 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. permalink fedilink source parent [–] ChaosMonkey@lemmy.dbzer0.com 3 points 1 year ago* (1 child) In my experience this can be beneficial when committing and rebasing small and distinct changes. permalink fedilink source parent hideshow 1 child comment replies: [–] GissaMittJobb@lemmy.ml 2 points 1 year ago 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. permalink fedilink source parent
[–] SavinDWhales@lemmy.world 8 points 1 year ago (1 child) Do you know our Lord and Savior rerere? (Though I rather squash most of the times) permalink fedilink source parent hideshow 1 child comment replies: [–] bungle_in_the_jungle@lemmy.world 5 points 1 year ago 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. permalink fedilink source parent
[–] bungle_in_the_jungle@lemmy.world 5 points 1 year ago 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. permalink fedilink source parent
[–] ChaosMonkey@lemmy.dbzer0.com 3 points 1 year ago* (1 child) In my experience this can be beneficial when committing and rebasing small and distinct changes. permalink fedilink source parent hideshow 1 child comment replies: [–] GissaMittJobb@lemmy.ml 2 points 1 year ago 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. permalink fedilink source parent
[–] GissaMittJobb@lemmy.ml 2 points 1 year ago 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. permalink fedilink source parent
