I've run into this in numerous projects, and have a few rules we follow to
avoid this kind of problem:
In general, all of the little things that reduce the chances of merge
conflicts in commonly changed are a great help (these only prevent the easy
to resolve kind of conflicts though):
* Keep r
On Aug 25, 2015, at 10:21 PM, Carl Swanson wrote:
> Does anyone work on a large nodejs project with a decent sized team where
> code source branching problems and re-merging becomes a problem? Where
> multiple people touch the same relative code area, and then have effort
> needed on successiv
Does anyone work on a large nodejs project with a decent sized team where
code source branching problems and re-merging becomes a problem? Where
multiple people touch the same relative code area, and then have effort
needed on successive check ins to merge code back together?
What have you done
