Today I tried something and got an unexpected result. So, I would like to know
what the right way would have been.
I created a new branch and made a whole bunch of changes. Some of these
changes were tested, and so I decided to merge them in to the trunk.
I did this by going to trunk, and
To: Fossil SCM user's discussion
Subject: Re: [fossil-users] Question about MERGE
On 10/28/15, to...@acm.org <to...@acm.org> wrote:
Today I tried something and got an unexpected result. So, I would like to
know what the right way would have been.
I created a new branch and made a whole
On 10/28/15, to...@acm.org wrote:
> Today I tried something and got an unexpected result. So, I would like to
> know what the right way would have been.
>
> I created a new branch and made a whole bunch of changes. Some of these
> changes were tested, and so I decided to merge
On 10/28/15, Richard Hipp wrote:
> On 10/28/15, to...@acm.org wrote:
>> OK, but doesn't cherry-pick work the same as a MERGE but only for single
>> version of the timeline?
>>
>> My intent was to get all changes from the branch (the whole history) but
>> for
>>
>
On 10/28/15, to...@acm.org wrote:
> OK, but doesn't cherry-pick work the same as a MERGE but only for single
> version of the timeline?
>
> My intent was to get all changes from the branch (the whole history) but for
>
Fossil does not currently support the ability to merge some
This is a surprisingly frequent need. Fossil is designed around a "get
things right the first time" philosophy but real life is often not that
crisp and clean. Being able to gracefully recover from mistakes and then
get rid of the irrelevant leftover cruft would be a wonderful addition to
fossil.
6 matches
Mail list logo