Xcode 4 workflow when working on the same iOS project with multiple developers

Can someone help me with providing an impeccable or official workflow for working with several developers in an iOS project running the [GIT / SVN] version.

With upstream versions, I don’t see the presence of a developer lock, if two of them change the storyboard, a merge conflict occurs. Xcode XML files are not very pleasant to merge and often lead to a merge problem and will actually be corrupted. It would be really interesting to know how Apple manages this with its internal teams, this will certainly help us.

+4
source share
3 answers

How difficult it is to combine everything, the quality of your merge tool depends. Conflicts are inevitable without causing (blocking) the code. Here is what I did. I realized that everyone would be editing right away, so I refused the storyboard and just went back to the XIB files. They are more decentralized and simplify the editing of two parts at once (in fact, I even walked away from NIB files and used even more abstract formats that load XIB files). In addition, I do not know if your command is local or not, but my team was, and we gave each other notifications that we will edit the files. We had some conflicts, but P4Merge very easily dealt with them (even in XML files). You just need to get used to the fact that you are looking at

0
source

As you say, XML files are a pain. We found the following tips:

  • Ask each developer to work in their own branch, so you only need to merge once.
  • Avoid NIBs and storyboards - put all your view codes in view classes and do all the transitions in your controller code.
  • Keep groups sorted by name; this reduces project file conflicts.
0
source

In our studio, we usually create an SVN repository with the following location:

- / Project root folder
== / Dev1Sources
==== / Sources
==== / Views
== / Dev2Sources
==== / Sources
==== / Views
... etc.
- / Shared libraries

The great thing to take notes is DO NOT use the interface constructor to bind variables and controls. You must tell your developers to programmatically create delegates and bindings. In addition, it tends to create many integration problems.

Use the following tools:
-Trello. Project management collaboration tool. Add the tasks you want to do, and whenever the module is completed, the developers will be notified, etc.
-Apigee. API documentation tool. Write your expected I / O API so that everyone in your project knows what and how to transfer information back and forth. MORE reduces API problems and development downtime.

Follow a few flexible / thrifty business practices to cut costs and increase success, speed, etc.

And last but not least, how the day breaks into a studio.

0-1st hour = Team meeting. Devs should upgrade the entire directory to the latest version.
2nd hour - development
LUNCH | 5-7th hour = Development
7th-8th hr = API Documentation and Group Analysis

This is a well oiled car. lol

0
source

All Articles