search

pigdevstudio / platform_template

Template project for platform games in Godot Engine.
MIT License
72 stars 12 forks source link

minor fix - node name #49

Closed Raccoon-JS closed 4 years ago

Raccoon-JS commented 4 years ago

background_music is misspelled. i just fixed it.

henriiquecampos commented 4 years ago

These commits that you are including in the PR were all merged already. Can you do the following:

  1. Open your repository on the terminal
  2. use git reset --soft upstream/master
  3. Select only the file you changed in this PR and commit it
  4. in the terminal use git push --force so you don't update to your origin and you can push the branch as it should be

I think these are the steps, if you don't feel comfortable doing that, lemme know and I can try to do it :grin:

henriiquecampos commented 4 years ago

@Raccoon-JS I think you commited all the files, there are conflicts now. Lemme see if I can fix. But ideally you should do the process I mentioned and only commit the new file.

henriiquecampos commented 4 years ago

Thanks I think it is good to merge now! :pig: :ok_hand: