Thank ya kindly for your followup Ashely and BP.

Ashley - you said, "simply forgetting to update before you start working then trying to commit at the end will cause things you have not changed to conflict with things other people have changed, because your copy is out of date (and it doesn't know if your intent is to roll it back). So accidents or misuse of source control systems cause that type of error."

So even with SVN, you never work in parallel with others with Construct 2? You always let them finish, commit their changes, you check them out, you commit, and then they can go again? If so, this was my chief misunderstanding, and it may warrant more clarification in the SVN tutorial. I consider the main benefit of SCM to be intelligent merging, so we can all sit down and work together at the same time, and then merge our work, without having to fix a bunch of conflicts.

I work with XML files all the time for iOS development, and git will merge multiple concurrent updates to the same file with ease. I guess thats why I'm confused its causing problems in this case.

Just picking nits of course, Construct 2 is awesome and I'm glad I'm alive to witness its coming global domination.

Ashley - Shouldn't modifying the same file only at (or around) the same line cause a conflict? That's my experience with Objective-C. It seems like in this case, modifying the same file anywhere will cause a conflict.   Even still, I'm fairly certain no one even modified the file in question, the stuff below the ======== was simply the previous state of the file, but I may be mistaken.

Is there any tool you all use that can out-merge git's auto merge? Is SVN actually better at this? I've never used SVN, but I just assume GIT is just as good at handling this stuff.

We've got a team of five using GIT for our four player fantasy themed sports game Crystal Brawl.

We basically never merge, because GIT can't auto-merge our Construct 2 XML files. We have to go into each file and manually fix the merges. Even if someone who's made a previous commit hasn't even touched a file I modified, it will mark a conflict, a la..

<<<<<<< HEAD

               <comment>Fireball removal -- DISABLED FOR NOW</comment>

               <event-block disabled="1" sid="5652866043242749">

=======

               <comment>Fireball removal</comment>

               <event-block sid="5652866043242749">

f7d0a3d1032d5be374ad3e3d5e04e2f5ac71a847

Our git .ignore looks like...

*.uistate.xml

*.capx.backup

*.capx.backup1

Is anyone else using GIT successfully and actually modifying files at the same time, and not in series?

Thanks,

Jon

So I'm looking at the Physics Distance Joint example project. Say I delete the html5 sprite and I have only the cog left. On mouse click, I would like to create a new cog and attach it with a distance joint to nearest instance of cog.

But the event for create distance joint doesn't allow me to specify an instance, only an object. Is this a limitation, or am I missing something?

thanks oodles,

Jon