Kevin Goslar

I have updated the documentation to explain this better in #3642.

@stephenwade thanks for sharing your workflow! I have created #3646 for discussing your idea of local-only feature branches.

> What if in the case of a diff between local & remote, git sync provides the ability to either continue syncing or delete the local branch via a prompt?...

If running `git checkout --theirs` is useful here, Git Town could offer to run it for you so that there is still some level of checking for unmerged changes.

> What if in the case of a diff between local & remote, git sync provides the ability to either continue syncing or delete the local branch via a prompt?...

Thanks for diving into the search for the right abstractions here! 🙏 This is indeed a complex area with many interrelated factors. There's definitely merit to the idea of offloading...

I like your idea to check the local repository state before running `git fetch`. This sounds like a reliable way to determine whether local branches have unpushed commits. Which addresses...

This is now shipped as [Git Town 16.5](https://github.com/git-town/git-town/releases/tag/v16.5.0).

I agree that there are opportunities to develop the DX around shipping stacks more. The problem of fake merge conflicts with the "merge" `sync-feature-strategy` are known and [documented](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squashing-and-merging-a-long-running-branch) by GitHub....

Yes, one can do the fast-forward merge manually locally and then push the new commit. That requires allowing pushing commits to the remote main branch, though. Which comes with severe...