From: "Kerry, Richard" <richard.kerry@atos.net>
To: Felipe Contreras <felipe.contreras@gmail.com>, Jeff King <peff@peff.net>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>
Subject: RE: [PATCH] branch: make -v useful
Date: Tue, 8 Jun 2021 11:32:18 +0000 [thread overview]
Message-ID: <AS8PR02MB7302955796AAEF8B9063505E9C379@AS8PR02MB7302.eurprd02.prod.outlook.com> (raw)
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:
>
> > 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
next prev parent reply other threads:[~2021-06-08 11:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 1:13 [PATCH] branch: make -v useful Felipe Contreras
2021-06-05 20:18 ` Ævar Arnfjörð Bjarmason
2021-06-05 22:35 ` Jeff King
2021-06-07 15:57 ` Felipe Contreras
2021-06-08 6:13 ` Jeff King
2021-06-08 7:17 ` Felipe Contreras
2021-06-08 7:27 ` Jeff King
2021-06-08 8:28 ` Felipe Contreras
2021-06-08 9:06 ` Kerry, Richard
2021-06-08 9:22 ` Felipe Contreras
2021-06-08 11:32 ` Kerry, Richard [this message]
2021-06-10 3:26 ` Felipe Contreras
2021-06-25 15:03 ` Kerry, Richard
2021-06-25 16:03 ` Felipe Contreras
2021-06-07 15:28 ` Felipe Contreras
2021-06-07 16:05 ` Ævar Arnfjörð Bjarmason
2021-06-07 18:00 ` Felipe Contreras
2021-06-07 18:37 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8PR02MB7302955796AAEF8B9063505E9C379@AS8PR02MB7302.eurprd02.prod.outlook.com \
--to=richard.kerry@atos.net \
--cc=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).