| ▲ | jiggunjer 2 days ago | |
Strange advice not to push the mega merge. It's what I call my release branch. One thing I like is there's many ways to achieve the same result. E.g. author uses a fancy rebase to graft a new branch between trunk and merge point. I could do the same by: 1) rebase -s onto trunk, 2) merge new branch with mega merge, 3) squash old megamerge upwards into new merge. No cryptic revset needed. | ||