From: Alexander Litvinov <lan@academsoft.ru>
To: git@vger.kernel.org
Subject: Question: next, master and pu branches
Date: Fri, 2 Feb 2007 11:41:53 +0600 [thread overview]
Message-ID: <200702021141.53997.lan@academsoft.ru> (raw)
Hello,
Can somebody explain the meaning of next and pu branches and some documenation
about using topic branches.
My development model use two branches now: stable release and develment
branch. All changes in the stable release branch are bug-fix only changes.
All (or most) of them must go to development release. Now I do this using
cherry-pick but it is not easy to track what was merged especialy when merge
pruduce confic resloved by hands. Stable branch live long life, much more
than 100 commits.
It seems topic branches can help me here, but reading Documentation under git
sources teach to make topic branch from the branch point and then merge it to
both branches. This can work while stable branch has short life and was not
heavily rewritten.
If there any technique that can help me ?
next reply other threads:[~2007-02-02 6:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-02 5:41 Alexander Litvinov [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-02-02 5:42 Question: next, master and pu branches Alexander Litvinov
2007-02-02 6:00 ` Shawn O. Pearce
2007-02-02 6:54 ` Alexander Litvinov
2007-02-02 6:57 ` Shawn O. Pearce
2007-02-02 6:02 ` Junio C Hamano
2007-02-02 6:52 ` Alexander Litvinov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200702021141.53997.lan@academsoft.ru \
--to=lan@academsoft.ru \
--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.
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 NNTP newsgroup(s).