After Obeya merges a contributor's pull request, it pulls main into the local checkout. Both runs below are the real code (before and after this change) on the same repository.
main has a commit of its own that is not pushed yet.pull.rebase, no pull.ff).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.. Please pull it yourself (git pull).
* 3d62d85 Local commit on main, not pushed yet * e6a9fe8 Initial commit
The merge is missing locally.
* f524c96 Local commit on main, not pushed yet * 7db1815 Merge pull request #5 (contributor) * 135be55 Initial commit
The merge is there, with the local commit rebased on top of it. No merge commit, the same way Obeya puts its own work on main.
Repository or global config sets pull.rebase, pull.ff or branch.main.rebase | That setting decides, as before. |
| No setting, local main has no commits of its own | Fast-forward, as before. Uncommitted changes outside the merge are kept. |
| No setting, local main has commits of its own | Rebase (new). Before this change, git refused the pull. |
| The pull stops on a conflict | Taken back, so the checkout stays as it was, and the card says so (as before). |