[mythtv] GIT

[James Linder]

Hi all
I’m using git pretty much exactly as mythtv does. ie

...
fixes/31
fixes/32

Where there will never be a merge of 31 and 32. All ticks along just fine until, one dsy,

hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

How does mythtv deal with this issue? I can find nothing in the docs.
James