Pulling main after a merged pull request

When Obeya merges a contributor's pull request, it brings the merge into your local main. If your local main had commits of its own and git had no pull setting, git refused that pull, and the card showed a wall of git hints. Obeya now rebases your local commits onto the merge in that case, the same way it puts its own work on main. A pull setting you have chosen still decides, and a rebase that hits a conflict is undone.