On 20/02/18 11:44, Johannes Schindelin wrote:
>
> Hi Hilco,
>
> On Tue, 20 Feb 2018, Johannes Schindelin wrote:
>
>> When I am particularly tired and overworked (and therefore know that my
>> working memory is less useful than usual), I therefore resort to my
>> second-favorite strategy: U use
On Tue, Feb 20, 2018 at 12:56 PM, Jeff King wrote:
> On Tue, Feb 20, 2018 at 12:44:51PM +0100, Johannes Schindelin wrote:
>
>> > It might be even possible to design a new subcommand for the interactive
>> > rebase to facilitate a variation of this strategy (possibly even making
>>
On Tue, Feb 20, 2018 at 12:44:51PM +0100, Johannes Schindelin wrote:
> > It might be even possible to design a new subcommand for the interactive
> > rebase to facilitate a variation of this strategy (possibly even making
> > use of the fact that the interactive rebase accumulates mappings
Hi Hilco,
On Tue, 20 Feb 2018, Johannes Schindelin wrote:
> When I am particularly tired and overworked (and therefore know that my
> working memory is less useful than usual), I therefore resort to my
> second-favorite strategy: U use the `done` file.
>
> I literally copy parts of
Hi Hilco,
On Mon, 19 Feb 2018, Hilco Wijbenga wrote:
> On Mon, Feb 19, 2018 at 2:36 PM, brian m. carlson
> wrote:
> > On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote:
> >> So a scenario like this:
> >>
> >> my-branch : X -> A -> B -> C -> D -> E -> F
On 19/02/18 19:35, Hilco Wijbenga wrote:
>
> Hi all,
>
> When maintaining a long running branch, I regularly rebase onto our
> active development branch so that my branch stays up-to-date. What
> happens fairly often is that during such a rebase, Git will exit
> because of rebase/merge
On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote:
> git rebase --onto base-branch HEAD~7
> commit A --> conflicts
> ... lots of work ...
> commit B --> conflicts
> ... lots of work ...
> commit C (Git handles conflicts)
> commit D (no conflict)
> commit E --> conflicts
> ... er,
On Mon, Feb 19, 2018 at 2:36 PM, brian m. carlson
wrote:
> On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote:
>> So a scenario like this:
>>
>> my-branch : X -> A -> B -> C -> D -> E -> F -> G
>> base-branch : X -> Y
>>
>> git rebase --onto base-branch
On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote:
> So a scenario like this:
>
> my-branch : X -> A -> B -> C -> D -> E -> F -> G
> base-branch : X -> Y
>
> git rebase --onto base-branch HEAD~7
> commit A --> conflicts
> ... lots of work ...
> commit B --> conflicts
> ... lots of
Hi all,
When maintaining a long running branch, I regularly rebase onto our
active development branch so that my branch stays up-to-date. What
happens fairly often is that during such a rebase, Git will exit
because of rebase/merge conflicts. Nothing unexpected there, of
course, but as it
10 matches
Mail list logo