News for hackers. Stuff that matters.
Re:Stack Overflow: How We Do Deployment by mwhite on Tuesday May 03, 2016 @11:45PM (#11626018)
A team of developers all working off of master doesn't necessarily require much communication about who's working where.

If your code is well organized into modules broken down by functional area, it should reduce the number of potential conflicts.

Also, fear of merge conflicts is somewhat unjustified; most conflicts can be resolved and rebased against using git rebase without that much work; the git rerere option [1] and git imerge [2] can also help with this.

If developers would actually learn how to resolve merge conflicts, and not be afraid of the occasional conflict resolution which requires understanding the other change and how to write new code that incorporates both changes, it's less overhead than communicating about pending changes.

[1] https://git-scm.com/docs/git-rerere [2] https://github.com/mhagger/git-imerge

Re:Stack Overflow: How We Do Deployment by hayd on Wednesday May 04, 2016 @12:02AM (#11626089)
The number of devs who screws up rebase, or worse merge, is astonishing. "I just used theirs" :|
Re:Stack Overflow: How We Do Deployment by bananaboy on Wednesday May 04, 2016 @08:49AM (#11627926)
You're right, there are a lot of devs like that. In this day and age of DVCS any developer worth their salt should be able to manage merges properly. It sounds like SO might not hire people who are incapable of understanding merging.