Hotfixes

Guess who's back.

Just some fixes for some weird text things that stood out to me after playing for the first time in months.

Also not sure what all those old commits are about, but they don't seem to have any effect, so no harm no foul, right?

You could always git rebase pregmod-master push -f

I can't force push into the master branch, though, which is what it seems it's trying to do.

He meant to do that on your hotfixes branch, not the pregmod-master branch. Checkout your hotfixes branch, rebase it onto master, then force push the hotfixes branch to gitgud. This should eliminate the extra commits.

When this happened to me we just used a squash merge and I started using rebase instead of merge.

added 3 commits

• cc612868 - Bugfixes
• e57807c6 - Bugfix for the bugfix
• 0febeebd - Merge branch 'hotfixes' of https://gitgud.io/DCoded/fc-pregmod into hotfixes

Compare with previous version

merged

mentioned in commit 177d05e5