search

LaurensWeyn / Spark-Reader

A tool to assist non-naitive speakers in reading Japanese
GNU General Public License v3.0
30 stars 7 forks source link

Delete workspace.xml (temporarily) and add it to .gitignore #3

Closed wareya closed 7 years ago

wareya commented 7 years ago

This has to be done on your end. You can back it up in the process, it just has to get out of the repository or it'll cause perpetual merge conflicts.

LaurensWeyn commented 7 years ago

Yea, I've noticed it's always got random garbage changes in it so I've omitted it from later commits. In fact, I believe that normally the entire .idea folder should be excluded, since that dot means it's hidden and another project I'm working on has that whole folder in gitignore. Though then again, that one has all the configuration stuff in maven pom files...

wareya commented 7 years ago

.idea definitely contains files that have to be in version control. It's annoying that it's not obviously documented which ones shouldn't be tracked. Either way, now that it's there, a commit has to delete it or it'll continue causing problems.

LaurensWeyn commented 7 years ago

Hopefully I've now fixed this once and for all... Also updated the NetBeans libraries while I was at it.

wareya commented 7 years ago

workspace.xml shouldn't cause merge conflicts any more, thanks!