twoolie / NBT

Python Parser/Writer for the NBT file format, and it's container the RegionFile.
MIT License
362 stars 74 forks source link

Add PyCharm .idea folder to .gitgnore #100

Closed danielniccoli closed 5 years ago

macfreek commented 5 years ago

Hi Borkason,

I understand your changes, but as it is, I would not favour committing these to the master branch:

macfreek commented 5 years ago

@Borkason I am looking forward to other improvements you have for NBT! (I noticed your request #99 and you are right about that broken URL).

danielniccoli commented 5 years ago

@macfreek I'm playing around with it. I actually only wanted to push the gitignore change. I have no idea how the other one slipped in there, especially because I did that change a lot later, when I was playing with the code in my own repository.

Edit: Btw, I see your point with the file. 👍

macfreek commented 5 years ago

@macfreek I'm playing around with it. I actually only wanted to push the gitignore change. I have no idea how the other one slipped in there, especially because I did that change a lot later, when I was playing with the code in my own repository.

I expect on of the quirks of Github played up: if you make a pull request from your master branch to twoolie's master branch, and you later make another commit to your master branch, this new commit will be added to the pull request as well. The solution is to create a temporary branch that only contains the intended commits.