[Office Hours]

[kcallon]

Related Discussion

Reproduction

We're currently struggling with merge conflicts because this branch is 1 commit behind main and 2 commits ahead.

Additional context

No response

Code of Conduct

• I agree to follow this course's Code of Conduct and Contributing Guidelines

[philippzagar]

Hi @kcallon, thanks for creating a GitHub Issue for the office hours! As far as I see from your screenshot, the conflicts occur in the Xcode project files (sadly a pretty common source for merge conflicts). Resolving the conflicts may be difficult and the screenshot above provides too little context: Let's discuss the details in one of the office hours this week!

[PSchmiedmayer]

@kcallon thank you for sharing your issues here in GitHub Discussions! You were not the only one having these issues and it is great to build up a knowledge repository around these issues!

I hope this issue has already been resolved. If so, can you and @philippzagar share what the solution was in the office hours so anyone who stumbles across the same issue can follow your solution ideas?

[philippzagar]

@kcallon I cannot remember fixing this issue with you during office hours. May you be able to share the solution you came up with?