RE: [PATCH] branch: make -v useful

From: Kerry, Richard <richard.kerry@atos.net>
Date: Jun 8, 2021, 11:32 UTC
Message-ID: <AS8PR02MB7302955796AAEF8B9063505E9C379@AS8PR02MB7302.eurprd02.prod.outlook.com>
In-Reply-To: <60bf36f24d2e2_1a848720836@natae.notmuch>

-----Original Message-----
From: Felipe Contreras <felipe.contreras@gmail.com> 
Sent: 08 June 2021 10:23
To: Kerry, Richard <richard.kerry@atos.net>; Felipe Contreras <felipe.contreras@gmail.com>; Jeff King <peff@peff.net>
Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>; git@vger.kernel.org; Junio C Hamano <gitster@pobox.com>
Subject: RE: [PATCH] branch: make -v useful

Caution! External email. Do not open attachments or click links, unless this email comes from a known sender and you know the content is safe.

Kerry, Richard wrote:

Show 7 quoted lines

> 
>  > Git is a distributed VCS, most people don't have commit access to  
> > the original repository, therefore they push to their personal  > 
> repository (e.g. github fork).
> 
> [RK] When you say "most people", do you mean "most people who are 
> working on open source projects"?

Both.

Two-way workflows are present both in open source projects and private projects.

Triangular workflows are present both in open source projects and private project.

> [RK] I'm working using Git every day, and I pull from the original 
> repository and push back to it. I am working on closed source company 
> projects.

The triangularity I'm referring to is not per repository, it's per branch.

Do you always push to the same remote branch you pull from? [RK] Yes. There are two people doing most of the work , me and one other. We each mostly: [RK] 1. Are not working on the same things. Ie we don't generate many conflicts [RK] 2. Pull and push to the same branch. Ie each of us has a branch that we work on. He uses "master", I have my own (It is a single very long-lived branch - I know that isn't a recommended workflow but that's where we are for the moment)

How about rebasing or merging? Do you use the same remote branch? [RK] Merges are infrequent, but because we are working in different areas, we merge to "our own" branch (few conflicts, usually) and push to its remote. [RK] I have never yet done a rebase, but need to do so soon as there is work in an area that we have both worked on. Then it will be pushed to the usual place - ie the two branches mentioned above.

[RK] So basically, no, not triangular at all, if I understand the meaning of triangular (pull and push to different remotes).

Cheers.

-- Felipe Contreras