Repoman hardsuit #1064
Repoman hardsuit #1064
Conversation
|
merge conflict moment? repoman assets must have been included with another pr |
|
I dunno why - I removed them from the Prestige CMO PR...? |
|
i tried to fix this and succeeded but it caused hours long torture because i have not yet figured out how to commit to someone else's PR. so the merge conflict is specifically because you accidentally left repoman assets in the prestige CMO pr, but had this branch set up before the prestige CMO pr was successfully merged, so git is really mad because it sees a commit where these assets were removed and a commit that adds them and doesnt know which one you actually want. i have no idea how to tell you how to fix that without telling you to use an IDE. it might be easier for you to close this pr, commit these assets again in a new branch, and pr that again |
Changelog
🆑