git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Sitaram Chamarty" <sitaramc@gmail.com>
To: Patrick.Higgins@cexp.com
Cc: git@vger.kernel.org
Subject: Re: git branch diagram
Date: Fri, 18 Apr 2008 07:08:46 +0530	[thread overview]
Message-ID: <2e24e5b90804171838w6809cb17sded64367d5ebc222@mail.gmail.com> (raw)
In-Reply-To: <911589C97062424796D53B625CEC0025E460C3@USCOBRMFA-SE-70.northamerica.cexp.com>

[Patrick: apologies if you get this twice; the first time I did
"reply" instead of "reply all" and it only went to you, not the list.]

On Thu, Apr 17, 2008 at 10:30 PM,  <Patrick.Higgins@cexp.com> wrote:
>  Does my diagram make sense? Are there any suggestions or corrections?

Looks ok to me, but I'm still learning git myself... so beware of what I say :-)

Some quick comments:

The Project repo (the big one in the middle) need not, I think,
maintain long-lived tracking branches for every developer.  Rather,
that repo would pull based on outside-git inputs (analogous to emails
saying "please pull from ...") and there might be a temp tree created
to test stuff out but once the merge or cherry-pick into the local
master is done that temp tree would disappear

However, if you don't have too many devs then your method is fine too.

The problem with devs working on the same branch that the project repo
pulls is that the commits may have some cruft, even though you said
they'd make branches for experimental things.  The way I'm working
now, my "master" is clean as a whistle and anyone pulling from it and
merging gets exactly what is needed.

Again, this is not a rule, but personal preference and if your style
of working is very clean then this may not be needed.

Regards,

Sitaram

  reply	other threads:[~2008-04-18  1:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-17 17:00 git branch diagram Patrick.Higgins
2008-04-18  1:38 ` Sitaram Chamarty [this message]
2008-04-18  2:29 ` Roman V. Shaposhnik
2008-04-18  6:46 ` Karl Hasselström
2008-04-18  8:39 ` Fedor Sergeev
2008-04-18 13:07 ` Matt Graham
2008-04-21  0:30 ` Jakub Narebski
2008-04-21 12:48   ` Matt Graham
2008-04-21 13:06     ` Jakub Narebski
2008-04-21 13:07     ` Luciano Rocha

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=2e24e5b90804171838w6809cb17sded64367d5ebc222@mail.gmail.com \
    --to=sitaramc@gmail.com \
    --cc=Patrick.Higgins@cexp.com \
    --cc=git@vger.kernel.org \
    /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).