git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Roman Gelfand <rgelfand2@gmail.com>
To: git@vger.kernel.org
Subject: GIT Branch Maintenance
Date: Tue, 5 May 2020 18:21:17 -0400	[thread overview]
Message-ID: <CAJbW+rmN=QPDm0myka1=iOpvzqe2kN-yk8GisdH2VDLRc1ReHw@mail.gmail.com> (raw)

Hello,

I am in a process of designing a git strategy for our vs solution.
The vs solution is a legacy asp .net webforms app which is enormous.
CI is out of the question because of cumbersome db source  setup.  So,
we are pretty much relying on integration testing.  We have roughly 6
people on development team.  Each of developers are assigned separate
feature.  Sometimes, a feature spans several releases.

Here are the branches:
Master - source that made it to prod
Feature - checked out from master Head.  The Head represents previous release.
QA - synchronized with master at the beginning of release development.
Upon completion, each active Feature branch is merged into QA.
Bugfix - in case of bug in current development, QA branch is checked
out to bugfix branch.  Upon completion, it is merged back into QA
branch.

Over time these master and qa branches will be enormous.  How do I
keep it concise preserving detailed history in case I need to hunt
down a specific commit?

Any help is appreciated.

Thanks in advance.

             reply	other threads:[~2020-05-05 22:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-05 22:21 Roman Gelfand [this message]
2020-05-05 23:10 ` GIT Branch Maintenance Randall S. Becker

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='CAJbW+rmN=QPDm0myka1=iOpvzqe2kN-yk8GisdH2VDLRc1ReHw@mail.gmail.com' \
    --to=rgelfand2@gmail.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).