From: Steinar Bang <sb@dod.no>
To: ding@gnus.org
Subject: Re: *bump* again
Date: Fri, 04 Nov 2011 09:36:37 +0100 [thread overview]
Message-ID: <yb0zkgccmi2.fsf@dod.no> (raw)
In-Reply-To: <m2aa8c20t4.fsf@boostpro.com>
>>>>> Dave Abrahams <dave@boostpro.com>:
> You don't have a development/integration branch where things can go
> during a feature freeze?
Note to Lars: having separate branches and merging between them is
_much_ less of a hazzle than in traditional version control tools (CVS,
subversion, perforce). I know this by first hand experience.
When you do get a conflict, git isn't any smarter than other version
control tools, but git is quiet clever at avoiding conflicts.
The development branch should be frequently merged with master, though.
Maybe a bot could do it, with notifications to a human operator when it
gets conflicts?
next prev parent reply other threads:[~2011-11-04 8:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-09 4:11 Patch Series: Warping via the registry Dave Abrahams
2011-10-09 4:11 ` [PATCH 1/6] Allow gnus-summary-insert-subject to work in empty groups Dave Abrahams
2011-10-09 4:11 ` [PATCH 2/6] Record information in the registry about each article retrieved Dave Abrahams
2011-10-09 4:11 ` [PATCH 3/6] Add `gnus-select-group-with-message-id' Dave Abrahams
2011-10-09 4:11 ` [PATCH 4/6] Add `gnus-try-warping-via-registry()' Dave Abrahams
2011-10-09 4:11 ` [PATCH 5/6] Enable registry-warping as a fallback if warping via the current backend fails Dave Abrahams
2011-10-09 4:11 ` [PATCH 6/6] Use `gnus-registry-enabled' instead of `gnus-registry-install' Dave Abrahams
2011-10-10 23:09 ` Patch Series: Warping via the registry Andy Moreton
2011-10-11 1:44 ` Dave Abrahams
2011-10-12 14:48 ` *bump* (was: Patch Series: Warping via the registry) Dave Abrahams
2011-10-12 23:38 ` *bump* Ted Zlatanov
2011-10-16 12:02 ` *bump* again Dave Abrahams
2011-11-03 22:56 ` Lars Magne Ingebrigtsen
2011-11-04 0:23 ` Dave Abrahams
2011-11-04 8:36 ` Steinar Bang [this message]
2011-11-04 11:26 ` Steinar Bang
2011-11-04 12:35 ` Gnus Git branching strategy for Emacs sync (was: *bump* again) Ted Zlatanov
2011-11-04 15:30 ` *bump* again Dave Abrahams
2011-11-04 16:07 ` Steinar Bang
2011-11-05 5:13 ` Dave Abrahams
2011-11-05 10:09 ` John Wiegley
2011-11-04 12:26 ` Ted Zlatanov
2011-10-12 15:04 ` Patch Series: Warping via the registry Andy Moreton
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=yb0zkgccmi2.fsf@dod.no \
--to=sb@dod.no \
--cc=ding@gnus.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).