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.
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.