How does one solve "This branch has conflicts that must be resolved" in git while merging pull request?

githubteacher / github-for-developers-sept-2015

practice repo for the Sept 29-30 GitHub for Developers class

12 stars 36 forks source link

Open kazyon opened 2 years ago

kazyon commented 2 years ago

Error is happening when i try to create a PR for a forked repository! Auto merge is not working correctly