post/2019-06-17-avoid-rebase-hell-squashing-wi/

[utterances-bot]

Avoid rebase hell: squashing without rebasing · The Odd Bit

You’re working on a pull request. You’ve been working on a pull request for a while, and due to lack of sleep or inebriation you’ve been merging changes into your feature branch rather than rebasing. You now have a pull request that looks like this (I’ve marked merge commits with the text [merge]): 7e181479 Adds methods for widget sales 0487162 [merge] Merge remote-tracking branch 'origin/master' into my_feature 76ee81c [merge] Merge branch 'my_feature' of https://github.

https://blog.oddbit.com/post/2019-06-17-avoid-rebase-hell-squashing-wi/

[SahilTikale]

Thank you. The first option worked like charm.

[ipepe]

Good content! Definitely gonna check out more posts on Your blog.

Also today I learned about https://utteranc.es/ that is really cool!

[jen2]

This is fantastic! It saved me from spending hours in interactive rebase hell. Going to share with my team! Thank you!

[larsks]

Glad you found it useful! :)

[merishas]

I created an account just to say thank you sooooooooooooooo much for the second option. It worked like a charm.

[mickeyperlstein]

Maybe the best rebase hell solution I have eve used. works every time and no mess as long as you are the only dev working on the branch, its gold

[tzaffi]

Well done Lars!!! This really solved my problem. I also "plagiarized" your approach for this Stack Overflow question

[pscheit-lillydoo]

nice but there is a small typo:

At this point, you work branch should be identical to the original my_feature branch (running git diff master should not show any changes)

should be

At this point, you work branch should be identical to the original my_feature branch (running git diff my_feature should not show any changes)

[larsks]

@pscheit-lillydoo Thanks! There is also another typo there, it's you -> your. I've fixed both!

[davidelbe]

Thanks for this. Really helpful for a commit tree that diverged in ways I couldn't understand.

[larsks]

It looks like someone has taken this post and made it useful 😃

[jimmzzz]

Great article!

[sdomi003]

so much better than replaying commits in interactive rebase

[dudeNumber4]

FYI: windows powershell won't run commit-tree, not sure which characters hose it up.

[OnlyTarg]

Thanks a lot!

[rorybot]

Just wanted to add, this was wonderfully helpful. Thank you.

[roryfahy]

Thanks for this from the future

[KurtGokhan]

Thanks for this. I created a function for the 1st method here: https://gist.github.com/KurtGokhan/d1fd49cac394276be53769b0dfb20795

[iainelder]

Option 1 is what autosquash should have been! Thanks for sharing the clean-push project too, and @KurtGokhan thanks for sharing your Bash code.

[saltzman007]

Gr8!!