Re: git: rebase, merge, fast-forward (hopefully explained)

[Erick Erickson <er...@gmail.com>]

Thanks Dawid!

On Wed, Feb 3, 2016 at 9:29 AM, Dawid Weiss <da...@gmail.com> wrote:
> I wrote up a simple step-by-step tutorial in which I hoped to
> demonstrate a typical workflow when working directly on a branch
> tracking a remote (for example on master or branch_5x). This is what
> people seem to be content with (even suggesting setting up automatic
> rebase). I think it's important to understand what is happening and
> why so I tried to explain in real-life commands *all* the typical
> scenarios and problems one may experience when trying to consolidate
> changes from the remote or push back to it.
>
> If you don't know how rebase, merge or fast-forward work and you have
> half an hour to spare on fiddling with a (local!) repository,
> impersonating Douglas and Adam, please give it a go:
>
> https://github.com/dweiss/lucene-git-guides/blob/master/04-working-directly-on-a-remote-tracking-branch.sh
>
> Obviously previous documents from that repo are also useful (to
> understand what staging area is, if nothing else).
>
> I don't know how to explain git better. This step-by-step writeup is
> kind of dumb, but if you follow it (and understand gitk's graphs I
> repeatedly call out to view) it really explains everything git does
> and everything that can happen to you.
>
> With this I closed LUCENE-6985 and I don't intend to come back to
> explaining git in a long while :) Have fun.
>
> Dawid
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org

Re: git: rebase, merge, fast-forward (hopefully explained)

[Dawid Weiss <da...@gmail.com>]

You're welcome!

D.

On Sat, Apr 9, 2016 at 4:39 PM, Erick Erickson <er...@gmail.com> wrote:
> Thanks Dawid!
>
> On Wed, Feb 3, 2016 at 9:29 AM, Dawid Weiss <da...@gmail.com> wrote:
>> I wrote up a simple step-by-step tutorial in which I hoped to
>> demonstrate a typical workflow when working directly on a branch
>> tracking a remote (for example on master or branch_5x). This is what
>> people seem to be content with (even suggesting setting up automatic
>> rebase). I think it's important to understand what is happening and
>> why so I tried to explain in real-life commands *all* the typical
>> scenarios and problems one may experience when trying to consolidate
>> changes from the remote or push back to it.
>>
>> If you don't know how rebase, merge or fast-forward work and you have
>> half an hour to spare on fiddling with a (local!) repository,
>> impersonating Douglas and Adam, please give it a go:
>>
>> https://github.com/dweiss/lucene-git-guides/blob/master/04-working-directly-on-a-remote-tracking-branch.sh
>>
>> Obviously previous documents from that repo are also useful (to
>> understand what staging area is, if nothing else).
>>
>> I don't know how to explain git better. This step-by-step writeup is
>> kind of dumb, but if you follow it (and understand gitk's graphs I
>> repeatedly call out to view) it really explains everything git does
>> and everything that can happen to you.
>>
>> With this I closed LUCENE-6985 and I don't intend to come back to
>> explaining git in a long while :) Have fun.
>>
>> Dawid
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>> For additional commands, e-mail: dev-help@lucene.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org