Collectible Card Game Headquarters

my latest commit has undone at least one of the recent changes to the remote repository, so i am planning on reading, learning and fixing it. sorry for the error.

edit: changed subject.

I'm looking at the commit log on git. There is a large gap of merges missing from the timeline. It goes from your commit on the 27 to your commits today on the 31.

I do not see and commits for the 28, 29, 30.

ok, the documentation is of little help. if anybody can fix this please do. i'm exceedingly embarrassed and out of patience with the documentation.

i'm really sorry i messed this up.

i actually miss subversion. i actually was able to figure out how to back out a change with that.

How did you end up committing your work? I know when I do things I need to Commit to my local Clone, then Pull the Master then Push the Combined changelist back up?

Well, it's not serious.

There are only two conflicts in AbstractCardFactory.

EDIT: I think I fixed it.

Thank you Sloth.

Looking at the commit logs I see that the commits for the last several days are once again displayed. My Krypto quest decks are back in the project.

Before I went to bed last night I did a sync with the master and saw 100+ incoming, < a dozen outgoing and a single conflict with the class AbstractCardFactory. Looks like Sloth's confilct fix also took care of the incomings and outgoings.

Thank you, Sloth.

i have the command line version working ok now, so if egit starts acting weird like it did last time, i'll switch to that. i think fiddling with settings in egit is what got me into trouble.

I much preferred SVN too.
Early during the discussion in the dmca/git thread, I had briefly looked around for european-based SVN hosting, but didn't find anything free.