Kevin Goslar

To fix this: - add a feature to https://github.com/git-town/git-town/tree/master/features/sync/current_branch/feature_branch where the push fails due to permission errors

I'm not against doing this. Just out of curiosity, why don't you do do `Squash and merge`? That's the most idiot-proof option in my experience (for people like me) and...

Git Town's primary purpose is to maximize the total throughput of an engineering team (hence the name "town"). From that perspective, a rebase strategy has many disadvantages: 1. It limits...

@blaggacao in #1452: > In a scenario, where I use eg. [commitizen](http://commitizen.github.io/cz-cli) to produce valid, structured and well auditable git history > I'd like to opt out to squashing the...

@blaggacao can you please outline which Git commands the various Git Town commands should run in your example? Does it still do a rebase when syncing and a rebase when...

Guidance for implementation: - go to file [sync-steps.go](https://github.com/git-town/git-town/blob/main/src/steps/sync_steps.go) - look at how [getSyncNonFeatureBranchSteps](https://github.com/git-town/git-town/blob/main/src/steps/sync_steps.go#L61) checks the `pull-branch-strategy` config setting and depending on it's setting appends either a `RebaseBranchStep` or a `MergeBranchStep`...

Additional motivation for this when creating large changes that should be reviewed commit by commit: https://github.blog/2022-06-30-write-better-commits-build-better-projects

This happens in [json_step.go](https://github.com/git-town/git-town/blob/5c475fc888862158300bdaecb2935caedbe11828/src/steps/json_step.go#L107). Apparently you are running into an edge case for which we have no feature spec. What does the command `1` do on your machine?

Does the error happen if you don't run `1` between the two runs of `git sync`? I.e. when you run `git sync` twice?

Or add the `FetchUpstreamStep` to [jsonStep](https://github.com/git-town/git-town/blob/5c475fc888862158300bdaecb2935caedbe11828/src/steps/json_step.go#L107)? But only if there is a legit use case for it that we can reproduce in a feature test.