Collectible Card Game Headquarters

I was trying to merge an update into the SVN. Something went wrong. I'm trying to change the "This card attacks each turn if able." keyword to "CARDNAME attacks each turn if able."

As I was trying to merge in the changes I received some (a lot) error messages from the SVN. Various problems reported while synchronizing … It looks like my changes were at some point accepted as r905 … but my local copy is now in conflict with the head version on our SVN.

The conflicts are with the 6 files that I updated and when I do a compare … there are no differences that can be found. I am stuck and do not know how to respond to this situation. I am really sorry for my screw up … I have no idea what I did wrong to mess things up like this. I appologize.

I have saved the Error Log and it is attached below incase someone can help to figure this out.


`

hi!

don't worry too much, if the problem was really your commit, we can always use the previous revision. If the problem is your local copy, you can back up the files you changed and revert the changes on the version-controlled files, then try to add your changes again. if nothing helps, delete your working copy and download forge from scratch

I have just updated my working copy, and the compiler doesn't protest, so it's probably alright

ps: i have had problems of that sort numerous times now on my own project. reverting files/directories usually resolves it

Yeah, I think everything is OK. I could not find any differences between my local copy and the SVN head version. The conflicts appear to have been caused by some sort of a difference in a time stamp and not in the actually code.

I had the SVN move it's version via incoming mode to my local copy and the conflicts are gone. I think only the time stamp was changed.

I think that we are safe.

Yeah don't worry about it Chris, stuff looks good, and the "CARDNAME attacks each turn if able." cards show up fine in the deck editor.

I'm about to make a humongous commit... I hope that won't screw over the SVN.

The best way to learn is by doing. (Even if it means that you brake a few eggs, ie. make a few mistakes.)

They say that we learn from our mistakes. I think we are OK … and good luck on your upcoming commit Dennis.