/practice-merge-conflicts

will be creating merge conflicts and then resolving them in both GitHub on your browser, and via the command line

first-branch

first-branch

main will be creating merge conflicts and then resolving them in both GitHub on your browser, and via the command line