logoalt Hacker News

wsc981today at 1:18 PM0 repliesview on HN

In case of many commits with also many complex merge conflicts, I often find it easier to just:

1. Abort rebase.

2. Squash all my commits into a single commit.

3. Rebase on target branch again.