search

Kurinku-Studios / FNF-Forward-Launcher

A mod launcher for FNF: Forward!
GNU General Public License v3.0
11 stars 9 forks source link

Update #33 - Cancel Button #47

Closed ColonelKai closed 3 years ago

ColonelKai commented 3 years ago

merge issues hahahahhaahahahaHAHAHAHA

mosemister commented 3 years ago

If you pull down the latest from master it will ask you what version you want to use. Typically you should look at it and manually edit them to what they should be.

However in this case, pull the latest and "accept theirs" (double check it so you dont remove any of the code), this happened because you pulled a previous commit, made your own commits and are now attempting to push onto a commit your git didnt know about