Fixed robot file placement I think

[cheesebroccoli]

Honestly github continues to be an enigma that escapes me at every turn

[torinriley]

you need to fix the merge conflicts

[cheesebroccoli]

Why cant you

…

On Sun, Oct 6, 2024 at 22:07 Torin Etheridge ***@***.***> wrote: you need to fix the merge conflicts — Reply to this email directly, view it on GitHub <CapitalRobotics/Janxs_Brain#9 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/A5DXPANA4OGI2SPNRXCRAGDZ2HUHTAVCNFSM6AAAAABPO4IQLOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGOJVG42TCNBYHE> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[torinriley]

because idk what changes and stuff you have on you're branch, just do this

git pull origin master

git checkout Chen-Chen

git merge master

then follow the instructions it gives you in the terminal, you can also look at this,
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

[cheesebroccoli]

):

…

On Sun, Oct 6, 2024 at 22:15 Torin Etheridge ***@***.***> wrote: because idk what changes and stuff you have on you're branch, just do this git pull origin master git checkout Chen-Chen git merge master then follow the instructions it gives you in the terminal, you can also look at this, https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line — Reply to this email directly, view it on GitHub <CapitalRobotics/Janxs_Brain#9 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/A5DXPALYQLKFEBPQTMXN7ALZ2HVDFAVCNFSM6AAAAABPO4IQLOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGOJVG42TMNZTGY> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[torinriley]

you could just forget your branch, make a new one, from the main branch, and then change the moter references, then no conflicts!