Multilingual, closing #168

[Lichtschalter-5000]

Firstly:
I'll make a draft-PR for now so we can discuss this alongside me coding...
Secondly:
Sorry, I'm kind of a newbie to git - and I might need your help with this:
Why is the commit history such a mess? I only want it to show 1c47308, as this is the only commit which differs from your master... 🙁
If you'll look in the "Network", you'll see this branch is branching of a fresh merge from your master into mine...

This fixes #168 btw.

[Lichtschalter-5000]

Could interest you, @brivadeneira

[goto-bus-stop]

The commit history is likely because your previous PR was done straight from the master branch. Then when you pull in new changes from this repo, it creates these extra merge commits. Especially when contributing to other repositories, it's generally best to work on feature branches and submit PRs from those, and keep your own master branch in sync with the upstream one. You can clean this up by:

• Pulling in the master branch from upstream (this repo)

  # may have to add a git remote for it
  git remote add upstream git@github.com:goto-bus-stop/wikibattle.git
  git pull upstream
  

• Resetting your local master branch to the upstream one (you'll have to be on another branch to do this)

  git branch -f master upstream/master
  

• Force-push that to your own repo for completeness

  git push origin master -f
  

And then you can get rid of the extra commits in this PR by rebasing your multilingual branch on your fixed master branch using

git rebase -i master

(that will open an editor with lines like pick $commithash $message, you can remove everything except the final commit which is the one specific to this branch)
and finally force-push the multilingual branch using git push origin multilingual -f.

let me know if you run into any trouble w that! :)

[Lichtschalter-5000]

Tada! 🎉
Thanks a lot. 😊 I'll definitely stick to that feature branch thing. 😅

[goto-bus-stop]

Oops, the PRs closed because I changed the default branch name … I don't think I can retarget your PRs, so if you want to pick these up again please create a new PR 🙏

[Lichtschalter-5000]

Oh I thought it'd be because they've been inactive for so long. Yeah, I lately got quite busy but I didn't forget about it!
At some point I'll pick it up again. 😊