Closed mcliquid closed 2 months ago
@mnalis Thanks! I'm using the GitHub Desktop application because I'm to dumb to use the command line tool. And I always mess up all the commands with merge, stash etc.
Yes, GitHub seems to deal with this correctly. You should also be able to pull main and base your changes on that in GitHub Desktop. But I never used it, so maybe this is not as straightforward as I think it should be.
@Helium314 Just a super small change to the source strings. I forgot a dot at the end of the parking lot string and I'm correcting "small village" to "smaller village". I hope it's mergeable like I did this?