Help
cancel
Showing results for 
Search instead for 
Did you mean: 
Highlighted
Pilot Lvl 1
Message 1 of 3

Managing Merge Conflicts Lesson 7 -Where are the pull requests?

Solved! Go to Solution.

Hello All,

 

Earlier today I started Managing Merge Conflicts, everything was going fine until I got to Lesson 7.  After completing Lesson 6 I got up, walked away from the computer to do a few other projects When I returned to resume Lesson 7 I found there was no open pull request remaining. Here's are two screenshots:

 

screenshot-github.com-2018.11.01-17-56-20.png

screenshot-lab.github.com-2018.11.01-17-57-55.png

Any ideas as to how I can get back on track. It seems the top screenshot opens on whatever completed lesson I click on.

 

Thanks,

Bater

2 Replies
Solution
Moderator
Message 2 of 3

Re: Managing Merge Conflicts Lesson 7 -Where are the pull requests?

Hey @BaterKari

Looks like you were pretty close! The error was that this pull request was approved and merged out of order: https://github.com/BaterKari/merge-conflict/pull/4

Since that one merged before the other was approved, there wasn't a conflict to resolve, and the app sent you responses out of order.

Screen Shot 2018-11-05 at 8.56.42 AM.png

To get back on track, you'll need to start over and make sure to avoid that pitfall on the next round. You're almost there!

Pilot Lvl 1
Message 3 of 3

Re: Managing Merge Conflicts Lesson 7 -Where are the pull requests?

Hi @hollenberry,

 

Well, sometimes doing something twice is the best way to learn. :)