search

CaedenPH / Jarvide

jarvide is a mix of an AI and an IDE that can securely run, save, edit, read, create, rename files all with a couple clicks of buttons.
MIT License
23 stars 17 forks source link

Fixed and added changes #127

Closed DTS-11 closed 2 years ago

DTS-11 commented 2 years ago

doesn't discord have /nickname and just right clicking and setting a nick?

whats the conflict?

realstealthninja commented 2 years ago

no conflict the command is fine

DTS-11 commented 2 years ago

no conflict the command is fine

then for me its showing: "Review required" then says: "this branch has conflicts that must be resolved"

realstealthninja commented 2 years ago

oh i dont have write access to the repo

realstealthninja commented 2 years ago

wait the conflict is that the mod.py is like alot of commits ahead of the mod.py you are using

DTS-11 commented 2 years ago

wait the conflict is that the mod.py is like alot of commits ahead of the mod.py you are using

uhh how do i fix that?

realstealthninja commented 2 years ago

pull then push again and i think you have to delete this pull request and make a new one