git/list[1] front-page[2] threads[3] people[4] search[5] about
 

GIT Branch Maintenance

From
RGRoman Gelfand <rgelfand2@gmail.com>
Date
May 5, 2020, 22:21 UTC
Message-ID
<CAJbW+rmN=QPDm0myka1=iOpvzqe2kN-yk8GisdH2VDLRc1ReHw@mail.gmail.com>
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.
Next: Randall S. Becker
Message 1 of 2 in “GIT Branch Maintenance”
  1. Roman GelfandMay 5, 2020
  2. Randall S. BeckerMay 5, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.