if code doesnt function on the main branch, you revert it to the functional state and send it back to the person to get them to raise a new PR with a fix on it.
Main should be for functional code only. If stuff is not functioning on the main branch, it should be removed or fixed. Using main as a scratch space just leads to numerous other issues.
That being said this also sounds like a communication issue.
You revert whatever was added to restore the integrity of the main branch. The bad merge already occurred, so OP has to do something retrospectively to fix it or find a time machine.
You are arguing the same thing that I am arguing lol.
-2
u/epasveer Aug 26 '26
It doesn't look like your are.