I didn't get any conflicts when I merged the trunk, but there was a warning of a criss-cross. I tried push --overwrite this time.
« Back to merge proposal
I didn't get any conflicts when I merged the trunk, but there was a warning of a criss-cross. I tried push --overwrite this time.