You should always do a git rebase against the master branch before
submitting a code review. Otherwise, your review diff may end up including
a lot of unrelated changes.
On Fri, May 29, 2015 at 10:32 PM Qi Luo <qilu...@gmail.com> wrote:

> Hi Rennie,
>
> I understood your solution, it works for most cases.
> But if remote/master has changed just during review progress, the diff
> would not be exactly synced with latest commit on master.
> I have to rebase every time in the way of your solution.
>
> What I expect is rbt can directly and automatically compare and generate
> diff between topic branch and remote/master.
> Don't know if rbt supports.
>
>
> On Saturday, May 30, 2015 at 1:47:32 AM UTC+8, Barret Rennie wrote:
>
>> Hi Qi,
>>
>> If you are doing one review per topic branch merge, you can merge master
>> into your topic branch or rebase your topic branch on top of master (if it
>> hasn’t been pushed yet). That way the diff between origin/master and the
>> topic branch will only contain the changes from the topic branch.
>>
>> Regards,
>>
> Barret Rennie
>>
>> On May 29, 2015, at 12:47 AM, Qi Luo <qil...@gmail.com> wrote:
>>
>> Our team is running github-flow which means we develop on topic branches
>> and then merge them into master branch. The review happens before merge.
>>
>> I've just tested how to use Review Board with above workflow. And I found
>> the diff generated by rbt post was only diff between origin/master and
>> current topic branch.
>> But you know, others may change the master branch (which I called it
>> remote/master) on git server, so the diff was not correct in the case.
>>
>> I don't know how if review board supports that or I just missed something.
>>
>> I'm on Review Board 2.0.15
>>
>> --
>> Supercharge your Review Board with Power Pack:
>> https://www.reviewboard.org/powerpack/
>> Want us to host Review Board for you? Check out RBCommons:
>> https://rbcommons.com/
>> Happy user? Let us know! https://www.reviewboard.org/users/
>> ---
>> You received this message because you are subscribed to the Google Groups
>> "reviewboard" group.
>>
>> To unsubscribe from this group and stop receiving emails from it, send an
>> email to reviewboard...@googlegroups.com.
>>
>>
>> For more options, visit https://groups.google.com/d/optout.
>>
>>  --
> Supercharge your Review Board with Power Pack:
> https://www.reviewboard.org/powerpack/
> Want us to host Review Board for you? Check out RBCommons:
> https://rbcommons.com/
> Happy user? Let us know! https://www.reviewboard.org/users/
> ---
> You received this message because you are subscribed to the Google Groups
> "reviewboard" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to reviewboard+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to