376683 (1) [Avatar] Offline
#1
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.

Thanks,
Randy
rickumali (130) [Avatar] Offline
#2
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!