2020-08-16T06:30:01Z

1 files changed, 13 insertions, 0 deletions

diff --git a/flow.txt b/flow.txt
index 3cabb285f7fa..cc30eb4f5183 100644
--- a/flow.txt
+++ b/flow.txt
@@ -9,6 +9,19 @@
              'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync flow
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
 Already up to date.
 *** syncing flow
 *** synced flow