eqPump (was VanillaEquipment) keyword

[DennisBergkamp]

No problems, Jim I don't think it was just you, I overwrote a bunch of changes as well.

[Chris H.]

I checked my notes for the last several months and found just 4 more cards.txt entries to fix. I will move my fixes to the top of the file. We can try it this way for a while and see if it makes it easier on all of us to see the changes.

[Rob Cashwalker]

I get <<<< and >>>> all the time in lots of files, including cards.txt and the .classpath. It sucks in .classpath, because it doesn't appear on the tree. It has to be fixed manually.

Eclipse can easily merge differences in the code, but it doesn't handle the cards.txt at all, and manual fixes are prone to these sorts of errors. Maybe a "replace from repository" for cards.txt is better than "update to head". Then paste the new card text at the top and then commit.

[jim]

Eclipse can easily merge differences in the code, but it doesn't handle the cards.txt at all, and manual fixes are prone to these sorts of errors. Maybe a "replace from repository" for cards.txt is better than "update to head". Then paste the new card text at the top and then commit.

I agree, that sounds like a better idea. I was also thinking, in terms of your previous suggestion of submitting files separately, that I would submit cards.txt separately from other changes. I'll try doing both these things from now on.

Ironically, for my next submission I don't have to touch cards.txt anyway.