News for hackers. Stuff that matters.
Re:Software Engineering at Google (2017) by philosopher1234 on Friday January 04, 2019 @06:18AM (#18823224)
Or, don’t branch. Is branching so essential?
Re:Software Engineering at Google (2017) by lordnacho on Friday January 04, 2019 @06:27AM (#18823257)
Isn't it essential for mental organisation? How do you think about what's different about a set of changes without some sort of DAG?
Re:Software Engineering at Google (2017) by username90 on Friday January 04, 2019 @05:41PM (#18828427)
They are grouped by linking them to issues in the issue tracker. All commits will then get a link to the issue and the issue gets a link back to the commit. This way you can easily track and read the full context of old changes.

Example issue, note that public ones are not associated with commits: https://issuetracker.google.com/issues/122326181

Re:Software Engineering at Google (2017) by yjftsjthsd-h on Friday January 04, 2019 @08:18AM (#18823748)
Just do one thing at a time? Today, I am working on X; my commits are for X, and details are in the commit message.
Re:Software Engineering at Google (2017) by dharmab on Friday January 04, 2019 @08:53AM (#18824016)
That breaks as soon as you have to interrupt working on Nice To Have Feature X to working on Inportant Bugfix/CVE Y.
Re:Software Engineering at Google (2017) by addicted on Friday January 04, 2019 @10:28AM (#18824630)
How often does that happen to an individual developer though?

Once a month? In an averagely well run company even that may be towards the higher end.

Should your entire development strategy be based on a once a month occurrence?

Re:Software Engineering at Google (2017) by idontpost on Friday January 04, 2019 @01:18PM (#18826274)
> Once a month?

Closer to once a week for me.

Re:Software Engineering at Google (2017) by hopler on Friday January 04, 2019 @08:02AM (#18823659)
Make one change at a time.
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.
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.

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.