kaaholst
commented
3 years ago I just merged this PR, thanks for the translations.
It merged without any problems, and the history looks OK.
To avoid these issues please don't commit directly onto your develop branch. Use a new branch instead. This makes merging much more easy.
You should keep the new branches up to date with the develop branch of this repo. I think the best way to do this, is to add another git remote. This way you don't have to have to local repositories. Here is a description of how to add a git remote: https://docs.github.com/en/github/getting-started-with-github/managing-remote-repositories
Now is a good time to do this, because I have just pushed some commits.
This is also a test if the setup is working with pull requests, updating my local code by pulling from your remote/develop, merging this into my own local develop (which already of course has the changes) and then updating my remote/develop.
Looks strange in the Log in AS, because my commits appear there twice now. But it seems to work as expected, since this pull request contains just the changes for translations.
Please tell me if I should do it differently.
EDIT: After applying the pull request I now see that it actually contains 4 commits. It should only contain one for "German translation". So, probably, this is not the way it should be done... :/