search

Ballsdex-Team / BallsDex-DiscordBot

Collect and exchange countryballs on Discord
Other
90 stars 144 forks source link

i have a problem when doing git pull #437

Open DaUkraine opened 1 week ago

DaUkraine commented 1 week ago

image so when i try to do git pull it gives me an error telling me to "stash" some files and when i try to stash the files it gives me another error image (1)

imtherealF1 commented 1 week ago

@DaUkraine this isn't a bug, you have made edits to the code yourself, meaning that when you try to merge the new changes you get conflicts, stopping you from git pulling. you can either stash (undoing your own changes), or you can solve the conflicts.

DaUkraine commented 1 week ago

oh. im just getting an error when trying to stash aswell and im very confused

imtherealF1 commented 1 week ago

@DaUkraine to stash, you need to type "git stash" in a command prompt/powershell in the directory of the bot's folder. remember that this command will undo all your custom changes to the code.

laggron42 commented 5 days ago

It looks like you're having issues with line endings too, see the warning about LF and CRLF. First do git config --global core.autocrlf true to fix this behavior in the future.

There are ways to fix a repository, but looking at your screenshot, your repository is very dirty and explaining you how to fix it will be way too long and complicated over Github comments. I would recommend to start over by doing git reset --hard origin/master, which will remove all local changes and put you in a working state again.