auto-resolve

Git Town automatically resolves phantom merge conflicts by default. If you run into a bug related to auto-resolution, please report it and then use this configuration setting to disable auto-resolution as a temporary workaround until the issue is addressed.

CLI flag

In one-off situations you can call commands that update branches with the --auto-resolve=no flag to disable automatic resolution of phantom merge conflicts.

config file

To configure automatic resolution of phantom merge conflicts in the configuration file:

[sync]
auto-resolve = false

Git metadata

To configure phantom merge resolution in Git, run this command:

git config [--global] git-town.auto-resolve <true|false>

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