search

davewx7 / citadel

A turn based strategy game based on the Anura engine
Other
99 stars 25 forks source link

Fix typo in Dream Eater description #252

Closed enlightenedliberal1 closed 6 years ago

enlightenedliberal1 commented 6 years ago

Changing plural to possessive

ghost commented 6 years ago

Good, thanks!

ghost commented 6 years ago

Because of the way I added your changes to the central repository (I surely should have created a merge commit in this case... 🤔), your clone is now away from the central repository in a way such that merging would create a (now) superfluous merge commit.

You might want to reset your master branch to the central master branch, or rebase your master branch on top of the central master branch.

If this is too much technical speak, just ignore for now.

In any case. Please read this article, paying special attention to this section. The article is written for a way of using GitHub that maybe doesn't apply to you. If so, please then read this article - that one's written removing the command line interface and remaining in line with the same essentials. Note that the first page of that last article essentially tells the same that the pointed section of the first article.

Thanks again!