News for hackers. Stuff that matters.

A comment on Software Engineering at Google (2017). Parent comment

Re:Software Engineering at Google (2017) by raverbashing on Friday January 04, 2019 @06:30AM (#18823269)
If you don't want to be stuck while a colleague does changes that conflict with what you're changing then yes, you need branching.
[ Parent | on HN ]
Re:Software Engineering at Google (2017) by hknd on Friday January 04, 2019 @06:50AM (#18823360)
You don't need branching for this.

If 2+ people are working on the same file which might result into a conflict, you can either: - handle the conflict as soon as you merge your branches somewhen in the future or - handle it when trying to commit your change to head

Only difference is whether you handle the conflict now, or in the future.

[ Parent | on HN ]
Re:Software Engineering at Google (2017) by hopler on Friday January 04, 2019 @08:03AM (#18823666)
You need to communicate with your colleagues to coordinate your work.
[ Parent | on HN ]