Copilot needs to be able to merge master and resolve conflicts

[FraserKillip]

I've been working with copilot coding agent from mobile while I'm AFK.

Unfortunately if I end up getting conflicts with master I'm shit out of luck because I can't resolve conflicts in the app or on the mobile website.

Since copilot can't do it itself my only option is to close the PR and get copilot to start all over again.

In some cases where I had back and forward this isn't practical.

Thanks in advance for the fix!

[omarabid]

@FraserKillip We built https://codeinput.com/products/merge-conflicts specifically for this purpose as people move from a IDE/Git clients flow to a fully online one. Feel free to give a shot, will be happy to hear your feedback.

If you want to better avoid conflicts in the future, limit copilot to edit files from a particular directory/component, so you don't have two copilots working on the same files.