sync-feature-strategy setting specifies how to update local feature
branches with changes from their parent and tracking branches.
When set to
merge (the default value), Git Town merges the parent and tracking
branches into local feature branches. When set to
rebase, it rebases local
feature branches against their parent and tracking branches.
The best way to change this setting is via the setup assistant.
In the config file the sync-feature-strategy is part
feature-branches = "merge"
To manually configure the sync-feature-strategy in Git, run this command:
git config [--global] git-town.sync-feature-strategy <merge|rebase>
--global flag applies this setting to all Git repositories on
your local machine. When not present, the setting applies to the current repo.