sync-prototype-strategy

The sync-prototype-strategy setting specifies how to update local prototype branches with changes from their parent and tracking branches. When not set, Git Town uses the sync-feature-strategy.

options

sync-prototype-strategy accepts the same options as sync-feature-strategy.

change this setting

The best way to change this setting is via the setup assistant.

config file

In the config file the sync-prototype-strategy is part of the [sync-strategy] section:

[sync]
prototype-strategy = "merge"

Git metadata

To manually configure the sync-prototype-strategy in Git, run this command:

git config [--global] git-town.sync-prototype-strategy <merge|rebase>

The optional --global flag applies this setting to all Git repositories on your machine. Without it, the setting applies only to the current repository.