{"thread":{"id":"26410","subject":"Potential problems with rebasing branch foo onto master, if master was previously merged into foo?","startedAt":"2011-02-04T18:28:33Z","lastAt":"2011-02-04T18:28:33Z","messageCount":1,"participants":["Dun Peal"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"160404","messageId":"AANLkTina+mXQ0dx+Xx300vcETgsEtHj-Jx0-OfzxywKC@mail.gmail.com","threadId":"26410","inReplyTo":null,"subject":"Potential problems with rebasing branch foo onto master, if master was previously merged into foo?","fromName":"Dun Peal","fromEmail":"dunpealer@gmail.com","sentAt":"2011-02-04T18:28:33Z","receivedAt":"2011-02-04T18:28:33Z","isPatch":false,"sender":{"key":"dunpealer@gmail.com","avatar":"https://gravatar.com/avatar/42f3e6a1166eb44e33f24c20ccbe809fa8591413f366dfe3755c8a8d4935ace9?d=mp&s=160"},"body":"I'm designing a workflow for a long-lived feature branch `foo`. This\nbranch will have `master` merged into about once day. About once a\nweek, we rebase `foo` back into `master`.\n\nAre there any problems to be expected in this workflow?  I have a\nhunch the rebase back into `master` might be subject to potential\nproblems that I can't foresee.\n\nI should mention that over 70 developers will be collaborating on\n`foo`, spread across multiple, widely diverging timezones; any state\nthat requires all of these developers to coordinate / synchronize will\nbe prohibitively expensive for us.\n\nThanks, D\n"}]}