Hi,
Addison and Matt and both working on quantum related things in their
branches. Addison wants to start to use the stuff that is in Matt's
branch, but Matt's branch is not ready to be reviewed and merged into
trunk. Can Addison just merge from Matt's branch into his own
repeatedly during the d
They should get good at the git rebase command. The —onto flag can also help,
such as if they want to rebase only part of a branch (the equivalent of
cherry-picking a group of commits). This is what I have been doing with my
branch and Mateusz's polys branches. Also, as Mateusz has done with
On Fri, Jul 16, 2010 at 2:57 PM, Aaron S. Meurer wrote:
> They should get good at the git rebase command. The —onto flag can also
> help, such as if they want to rebase only part of a branch (the equivalent of
> cherry-picking a group of commits). This is what I have been doing with my
> bran
On Fri, Jul 16, 2010 at 5:57 PM, Brian Granger wrote:
> On Fri, Jul 16, 2010 at 2:57 PM, Aaron S. Meurer wrote:
>> They should get good at the git rebase command. The —onto flag can also
>> help, such as if they want to rebase only part of a branch (the equivalent
>> of cherry-picking a group
On Fri, Jul 16, 2010 at 10:05 PM, Ondrej Certik wrote:
> On Fri, Jul 16, 2010 at 5:57 PM, Brian Granger wrote:
>> On Fri, Jul 16, 2010 at 2:57 PM, Aaron S. Meurer wrote:
>>> They should get good at the git rebase command. The —onto flag can also
>>> help, such as if they want to rebase only pa
I've decided to do only merges (no rebase) for a while to see how it works out
(except for fixups and squashing, which I try to do before pushing or soon
after pushing). I like how merging keeps a linear history for both branches,
so you don't have to worry about changing SHA1 hashes, and it a
