The Author Online Book Forums are Moving

The Author Online Book Forums will soon redirect to Manning's liveBook and liveVideo. All book forum content will migrate to liveBook's discussion forum and all video forum content will migrate to liveVideo. Log in to liveBook or liveVideo with your Manning credentials to join the discussion!

Thank you for your engagement in the AoF over the years! We look forward to offering you a more enhanced forum experience.

376683 (1) [Avatar] Offline
If the following document could be updated to include lab answers for Chapter 14, it would be greatly appreciated. I'm participating in the Boston PHP Book Study. Number One (merge the last fetch...) is not obvious to me.

rickumali (134) [Avatar] Offline
Hi Randy,

Thanks for your participation!

I have been behind in the answer key, that's for sure. I hope to update the document this week. In the meantime, please feel free to send questions into this forum.

As for your question, the exercise refers to section 14.5. In that section, the TRY IT NOW has you doing a git fetch, then a git diff HEAD FETCH_HEAD. However, the section does not walk you through the git merge, hence the exercise.

I believe completing this exercise will have you performing the steps of the "Conflicted merges" section (14.3.4).

I hope this helps!