search

mojira / mojira-discord-bot

🎮 A Discord bot for linking to and providing information about Mojira tickets
https://discord.gg/rpCyfKV
GNU General Public License v3.0
19 stars 9 forks source link

Upgrade dependencies #253

Closed mdashlw closed 2 years ago

mdashlw commented 2 years ago

Fixes some vulnerabilities. GIt made a mess of commits, but it should be mergeable, let me know if you know how to fix it

Pokechu22 commented 2 years ago

You seem to have created a weird merge with two versions of your changes; try running git rebase master and see if that gets rid of one of the copies. If not, git rebase -i master might let you remove the incorrect one. (After rebasing, use git push --force-with-lease to push the changes; regular git push won't work after a rebase)

mdashlw commented 2 years ago

You seem to have created a weird merge with two versions of your changes; try running git rebase master and see if that gets rid of one of the copies. If not, git rebase -i master might let you remove the incorrect one. (After rebasing, use git push --force-with-lease to push the changes; regular git push won't work after a rebase)

PS C:\Users\mdashlw\Documents\mojira-discord-bot> git rebase master
Current branch master is up to date.
PS C:\Users\mdashlw\Documents\mojira-discord-bot> git rebase -i master
Successfully rebased and updated refs/heads/master.
PS C:\Users\mdashlw\Documents\mojira-discord-bot> git push --force-with-lease
Everything up-to-date