19/03/2014 16:12, Richard Heck:
Alternatively, you can just push a new branch. I don't see any reason to
worry
about their being multiple branches for a single feature.
Indeed, in future we might want to have a sort of namespace for these
features
branches, so they had names like:
str-metri
On 03/19/2014 10:49 AM, Vincent van Ravesteijn wrote:
On Wed, Mar 19, 2014 at 3:30 PM, Jean-Marc Lasgouttes
wrote:
18/03/2014 23:12, Vincent van Ravesteijn:
Apparently rebasing onto master didn't go without problems. The merge
conflicts were mainly caused by your recent commit "Whitespace onl
19/03/2014 15:49, Vincent van Ravesteijn:
It looks good. When I pushed it yesterday it wouldn't compile because
you recently introduced a call to a function that you renamed in this
branch, but I assume you fixed it.
Yes, this is something I already had to do in my big 1-commit-rebase
version.
On Wed, Mar 19, 2014 at 3:30 PM, Jean-Marc Lasgouttes
wrote:
> 18/03/2014 23:12, Vincent van Ravesteijn:
>
>> Apparently rebasing onto master didn't go without problems. The merge
>> conflicts were mainly caused by your recent commit "Whitespace only".
>> That's not the wisest thing to do if you h
18/03/2014 23:12, Vincent van Ravesteijn:
Apparently rebasing onto master didn't go without problems. The merge
conflicts were mainly caused by your recent commit "Whitespace only".
That's not the wisest thing to do if you have a branch touch a lot of
code in the same area.
But, it was easily fi
Vincent van Ravesteijn schreef op 18-3-2014 14:02:
On Tue, Mar 18, 2014 at 1:46 PM, Jean-Marc Lasgouttes
wrote:
18/03/2014 12:56, Vincent van Ravesteijn:
I don't see the need for keeping the merges. However, I cannot access
the git repo right now.
I do not necessary want to keep them, I ju
On Tue, Mar 18, 2014 at 1:46 PM, Jean-Marc Lasgouttes
wrote:
> 18/03/2014 12:56, Vincent van Ravesteijn:
>
>
>> I don't see the need for keeping the merges. However, I cannot access
>> the git repo right now.
>
>
> I do not necessary want to keep them, I just do not want to have mix my
> commits w
18/03/2014 12:56, Vincent van Ravesteijn:
I don't see the need for keeping the merges. However, I cannot access
the git repo right now.
I do not necessary want to keep them, I just do not want to have mix my
commits with the stuff from master.
Is it possible to remove merges a posteriori?
17/03/2014 21:59, Vincent van Ravesteijn:
Yes there is. You can do:
$ git checkout str-metrics
$ git reset
The you can see in the e-mail. I guess
it is either the first or the last line which starts with "discards ...".
OK, I did that. Now I would like to do commit squashing/fixup, but
wit
Jean-Marc Lasgouttes schreef op 17-3-2014 21:49:
17/03/2014 17:39, Vincent van Ravesteijn:
I personally would prefer a series of nice and clean commits, which
might be easier to parse by a human being than one 2725-lines-difff
commit.
Sigh. The impression I got from our last discussion on the
17/03/2014 17:39, Vincent van Ravesteijn:
I personally would prefer a series of nice and clean commits, which
might be easier to parse by a human being than one 2725-lines-difff
commit.
Sigh. The impression I got from our last discussion on the subject was
that having the lots of commit with c
On Mon, Mar 17, 2014 at 2:40 PM, Jean-Marc Lasgouttes
wrote:
> 17/03/2014 14:34, Jean-Marc Lasgouttes:
>
>> The branch, str-metrics, has been updated.
>>discards c3600ccbf4c861035446cfbe77c57bbc48c455ab (commit)
>>discards f6637dcbc89a67d0238f5979f7457f2bbc9c9e9b (commit)
>>discards
17/03/2014 14:34, Jean-Marc Lasgouttes:
The branch, str-metrics, has been updated.
discards c3600ccbf4c861035446cfbe77c57bbc48c455ab (commit)
discards f6637dcbc89a67d0238f5979f7457f2bbc9c9e9b (commit)
discards 5e609e9ea164ea248ea2a5f0dece75fc530419da (commit)
discards 0e5267c9a63c
13 matches
Mail list logo
