Exercise

Handling push conflicts

Remote repos enable collaboration in Git, but it is important to regularly synchronize your local repo.

In this exercise, you'll see what happens when they aren't aligned, and how to deal with this scenario.

Instructions 1/3

undefined XP

1
- Send changes in the local repo's main branch to the remote repo called origin.

2
- Pull origin into the local main branch, entering a message of your choice inside the text editor.
3
- Try again to update the remote with changes made in the local main.