All,
A long time ago, I check out several ansible roles (contained inside the fedora-server
repository). I have made quite a few changes to those ansible roles and am ready to
commit those changes. The commit to my local repository went fine. When I went to push
my local repository to the pagure repository, I am told that others have made commits to
the pagure repository and I need to do a "git pull". I did a "git pull" and was told that
I have divergent branches and I need to reconcile them.
git suggested:
From ssh://pagure.io/fedora-server
596ef4d..f108b57 stg -> origin/stg
c737c80..9a6ad14 main -> origin/main
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
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.
Since I am a git neophyte, I am at a total loss as to what to do next. Any suggestions
would be greatly appreciated.
Thanks.