[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Gitlab Migration
From: |
Eli Zaretskii |
Subject: |
Re: Gitlab Migration |
Date: |
Sun, 29 Aug 2021 11:45:03 +0300 |
> Date: Sun, 29 Aug 2021 10:23:17 +0200
> Cc: <dgutov@yandex.ru>, <larsi@gnus.org>, <danflscr@gmail.com>,
> <philipk@posteo.net>, <theo@thornhill.no>, <monnier@iro.umontreal.ca>,
> <emacs-devel@gnu.org>
> From: "Drew DeVault" <sir@cmpwn.com>
>
> On Sun Aug 29, 2021 at 10:21 AM CEST, Eli Zaretskii wrote:
> > I no longer remember the exact details, it was something we bumped
> > into during discussions when Emacs switched to Git. AFAIR, it had to
> > do with working on a feature branch and frequently rebasing it onto
> > the latest master (so that the feature branch doesn't diverge too
> > much), then later merging from the feature branch to master.
>
> Hm, weird. I would like to see some reproducible evidence of this so
> that a deeper investigation can be done. I've used rebase thoroughly for
> many years on hundreds of projects without any such incident.
It is buried in this long discussion:
https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01436.html
AFAIR, it had to do with "pull --rebase" as well, and the fact that
when doing the rebases in this case, Git "invents" anonymous
branches. Or something.
- Re: Gitlab Migration, (continued)
- Re: Gitlab Migration, Eli Zaretskii, 2021/08/29
- Re: Gitlab Migration, Drew DeVault, 2021/08/29
- Re: Gitlab Migration, Eli Zaretskii, 2021/08/29
- Re: Gitlab Migration, Drew DeVault, 2021/08/29
- Re: Gitlab Migration, Theodor Thornhill, 2021/08/29
- Re: Gitlab Migration, Drew DeVault, 2021/08/29
- Re: Gitlab Migration, Theodor Thornhill, 2021/08/29
- Re: Gitlab Migration, theo, 2021/08/29
- Re: Gitlab Migration, Tassilo Horn, 2021/08/29
- Re: Gitlab Migration, Theodor Thornhill, 2021/08/29
- Re: Gitlab Migration,
Eli Zaretskii <=
- Re: Gitlab Migration, João Távora, 2021/08/29
- Re: Gitlab Migration, João Távora, 2021/08/29
- Re: Merges from release branch (was: Gitlab Migration), Eli Zaretskii, 2021/08/29
- Re: Merges from release branch, David Engster, 2021/08/29
- Re: Merges from release branch, João Távora, 2021/08/29
- Re: Merges from release branch, João Távora, 2021/08/29
- Re: Merges from release branch, Eli Zaretskii, 2021/08/29
- Re: Merges from release branch, João Távora, 2021/08/29
- Re: Merges from release branch, Eli Zaretskii, 2021/08/29
- Re: Merges from release branch, João Távora, 2021/08/29