hectorsector / 3-merge-conflicts Goto Github PK

👋 Welcome to your merge conflict practice!

This lab is set up to help you get some hands-on practice on merge conflicts. I'll drop by to try and guide you along, but I'll mostly try to stay out of the way and let you try.

By now, you should have finished the following parts of the in-class agenda:

• Defining merge conflicts
• Resolving a merge conflict

Ready to get started?

⌨️ Activity

1. Click the Close issue button below.

---

Watch below for my response.

Well done!

Congratulations @hectorsector, you've completed the Trio of Conflicts course! Your detective skills in finding those merge conflicts would make the great Sherlock Holmes proud.

During this course you successfully:

• Resolved a simple merge conflict on the GitHub user interface
• Fixed a merge conflict that had lingering conflict markers from a past merge conflict
• Resolved a merge conflict locally dealing with the modification and removal of files

Keep learning

Want to keep learning? Feel free to check out our other courses?

---

I won't respond to this issue, go ahead and close it when finished!