Ch3. Interactions with other changes
Git is pretty straightforward until we start working with others.
Like you see, it doesn't take...
For further actions, you may consider blocking this person and/or reporting abuse
The challenge with merge conflicts is that it indicates that two people have modified the same area of code, presumably for a reason. The challenge of merge conflicts is knowledge what was changed and how to combine the so both reasons remain intacked.
It is important the goal isn't to just get it to compile.
Sure. That is why we call it 'conflicts'. I talked about how we can resolve them in technical perspectives after talking with other devs and planning which one to take.
My solution is to always check in first & let the other dev handle it. 🤓
That can work up to certain points.. If you are in a position to guide someone through, time to learn depth😉