I saw this problem when merging master into the networking branch. Someone had merged code on their branch and committed without resolving merge conflicts.
Please fix your merge conflicts before committing. If the conflict deals with a file you aren't familiar with then please ask another team for assistance.
I saw this problem when merging master into the networking branch. Someone had merged code on their branch and committed without resolving merge conflicts.
Please fix your merge conflicts before committing. If the conflict deals with a file you aren't familiar with then please ask another team for assistance.