Anyone use GIT for version control??

Discussion and feedback on Construct 2

Post » Tue Aug 27, 2013 5:47 pm

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.
B
4
S
1
Posts: 4
Reputation: 458

Post » Wed Aug 28, 2013 11:02 am

No, the pattern (as described in the tutorial I linked to) is just to update, make changes, commit (for SVN anyway). It should only conflict if two people change the same thing at the same time (between update and commit). Normally working in parallel is fine, but you should have some level of co-ordination to try to avoid two people modifying the same thing at once.
Scirra Founder
B
398
S
236
G
88
Posts: 24,433
Reputation: 194,635

Previous

Return to Construct 2 General

Who is online

Users browsing this forum: AnD4D and 16 guests