git log --decorate --graph --oneline --all will show the true history of your repository and if there's any important changes in main. Clearly there are changes in main.
↧
Comment by Schwern on Git Rebase Feature Branch to Main - Conflict
↧