[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: GSoC-2020 update: Jul 31
From: |
Urs Liska |
Subject: |
Re: GSoC-2020 update: Jul 31 |
Date: |
Sat, 01 Aug 2020 18:19:35 +0200 |
User-agent: |
K-9 Mail for Android |
Am 1. August 2020 16:12:24 MESZ schrieb Werner LEMBERG <wl@gnu.org>:
>>> Another issue: Maybe it makes sense if you try to rebase your
>>> branch from time to time.
>>
>> Really rebase?
>
>Yes, I favour rebasing over merging since the former causes a
>`prettier' git commit tree.
>
>> This would be a case where "general wisdom" argues against modifying
>> pushed commits. Typically you'd rather merge master into your
>> working branch here.
>
>Well, there's a good reason that gitlab has a big, fat 'rebase'
>button...
Yes, but that is meant to deal with integrating the final result into master.
Rebasing during work means that Owen's commits don't match those pulled by
others.
I don't have a strong opinion here but it should be an agreed-upon procefure
for all.
Urs
>
>
> Werner
--
Diese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet.
Re: GSoC-2020 update: Jul 31, Owen Lamb, 2020/08/03