GIT BRANCHING - mergers conflict 2 - exercise 3

I’m confused with what exercise 3 on merge conflict 2 is asking. Has someone got passed this problem?: thinking:

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.