house
house copied to clipboard
Challenge: Generate a merge conflict and safely resolve it yourself.
You can follow this article to generate a merge conflict. This is a simulation only.
Tag me if you manage to resolve it :) good luck!