Re: Rebasing a branch with merges

2017-01-09 Thread Philip Oakley
From: "Robert Dailey" On Fri, Jan 6, 2017 at 3:28 PM, Philip Oakley wrote: From: "Robert Dailey" Here's the scenario: I create a topic branch so one other developer and myself can work on a feature that takes 2 weeks to complete. During that 2 week period, changes are occurring on master t

Re: Rebasing a branch with merges

2017-01-09 Thread Robert Dailey
On Fri, Jan 6, 2017 at 3:28 PM, Philip Oakley wrote: > From: "Robert Dailey" >> >> Here's the scenario: >> >> I create a topic branch so one other developer and myself can work on >> a feature that takes 2 weeks to complete. During that 2 week period, >> changes are occurring on master that I nee

Re: Rebasing a branch with merges

2017-01-06 Thread Philip Oakley
From: "Robert Dailey" Here's the scenario: I create a topic branch so one other developer and myself can work on a feature that takes 2 weeks to complete. During that 2 week period, changes are occurring on master that I need in my topic branch. Since I have a collaborator on the branch, I opt

Rebasing a branch with merges

2017-01-06 Thread Robert Dailey
Here's the scenario: I create a topic branch so one other developer and myself can work on a feature that takes 2 weeks to complete. During that 2 week period, changes are occurring on master that I need in my topic branch. Since I have a collaborator on the branch, I opt for merges instead of reb