How to work in a team? What tools to use?

Question

git

Worked on an iOS app, now teamed up with another programmer. Hence a few questions:
How to work on one project?
I open a project, pull with gh?
Should we create our own branch?
If we change one file, how to merge it later?
Will everyone work effectively with their own storyboard, and if possible, write ui code in the class?
Is it possible to work somehow in real time?
For example, I added a class with functionality, the second programmer is engaged in graphical output to the user?
Perhaps someone will advise useful services / programs for teamwork? While we are using slack (chat, send a piece of code), skype (share the screen, voice)
I would like to know about the service where you can set tasks and monitor their status
. Maybe someone will share their methods of working in a team and the services used?
Interested mainly under OS X

Answer 1

1) "I would like to know about a service where you can set tasks and monitor their status"
Jira, Wekan.
2) "Interested mainly under OS X"
No difference
3) Branching model
There will be more questions ask

Answer 2

For task tracking, I would recommend Trello. Simple and convenient.
> I open a project, pull with gh?
Yes.
> Should we each create our own branch?
No, this is not required. It is better to create a branch for development and commit to both, then merge with master as needed (for example, when some feature is implemented). Or, in general, make your own branch for each feature, but this is already too much, IMHO, for 2 people.
> If we change one file, how to merge it later?
Git can merge itself. Conflicts can arise if you both edited the same line. Xcode has a nice interface for resolving such conflicts, and it will show it on pull if needed.
But with storyboards, you will have to work in turn, you can’t just merge them.
> Is it possible to work somehow in real time?
What is it like? See what your friend is typing? :) I don't think it's necessary. Except just4fun.

Answer 3

The thread is not required.
But if you rarely merge and pull a fresh version, then a separate branch is better.
Merge one file? Manually. It is best not to pick one file. Somehow agree.
At the same time (as you write in real time) without an additional message will not work. Not the fact that you have identical speed. Especially in different types of work.