How to resolve merge conflicts in Git without guessing: markers, --ours/--theirs and the rebase flip

You are rebasing your branch onto main. Git stops on a conflict in limits. py .

Source: [Dev.to](https://dev.to/devopsdaily/how-to-resolve-merge-conflicts-in-git-without-guessing-markers-ours-theirs-and-the-rebase-flip-b4g)