We use Git in our project with several developers working concurrently.
Contributes work with git as follows
- branch from origin/master to a feature branch
- When they are done, merging or rebasing the latest origin/master to their feature branch
- Execute a pull request back the master
A major headache is the .cproject
If its changed by more than one developer at a time, its very difficult, dangerous and time consuming to merge it textually
A deep and, to me, unintuitive XML hierarchy is only part of the problem - the fact that each entry is one long line makes it super hard to see what the differences are and if there are clashes.
Our solution - try to avoid using any options that end up in the ,cproject files - for example we use virtual folders with links (which are stored in the .project file) instead of excludes which are stored in the .cproject files
How have you dealt with these issues ?
We're using V7 - I know its ancient - not my decision
