Kevin Goslar

This is now available in [Git Town 17](https://github.com/git-town/git-town/releases/tag/v17.0.0). Enjoy!

Concern: Step 1 doesn't pull in new commits from the main branch. Hence step 2 might still pull in new changes from main that prevent automatic resolution. Maybe Git Town...

That's indeed a pretty annoying GitHub issue. A few more details are in this thread: https://github.com/git-town/git-town/issues/3236#issuecomment-2021777211. If you (or anybody you know) figures out a better solution to ship branches...

Git Town 16 provides an elegant solution to this problem: fast-forward merging.

> I'm curious whether Git Town 16 is still merging main into the parent branch before deleting it. [Git Town 15.0](https://github.com/git-town/git-town/releases/tag/v15.0.0) changed the behavior of `git ship`. It no longer...

The issue with automatic resolution of phantom merge conflicts caused by squash-merging is still an ongoing challenge. We've had some great discussions in this thread, and a few promising approaches...

Approach 2 would be better but will probably only work for the `merge` sync strategy, not the `rebase` and `compress` strategies. Because in the latter cases, there are different commits...

I added end-to-end tests that reproduce phantom merge conflicts in https://github.com/git-town/git-town/pull/4181. An interesting insight is that phantom merge conflicts don't happen with the `rebase` [sync-feature-strategy](https://www.git-town.com/preferences/sync-feature-strategy) - at least I wasn't...

> My ideal situation would be Git Town rebasing child branches on top of the new main branch. After merging A, I don't want B to have A's commits visible...

@mball-agathos thanks for all the super helpful research. I agree; handling the various types of merge conflicts can be complex. That said, I believe that the phantom merge conflicts we...