From: Eli Zaretskii <eliz@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Sat, 02 Jul 2016 09:29:29 +0300 [thread overview]
Message-ID: <83inwotuwm.fsf@gnu.org> (raw)
In-Reply-To: <8760spjftg.fsf@lifelogs.com> (message from Ted Zlatanov on Fri, 01 Jul 2016 15:53:15 -0400)
> From: Ted Zlatanov <tzz@lifelogs.com>
> Date: Fri, 01 Jul 2016 15:53:15 -0400
>
> EZ> Why did you make so many merges from master onto the scratch branch?
> EZ> This shouldn't be necessary to begin with.
>
> The point is that it's a scratch branch. I'm asking for these branches
> to be excluded from diffs, otherwise I'll have to use another Git server
> so I'm not spamming emacs-diffs.
A scratch branch is still a public branch.
I don't necessarily object to excluding them from emacs-diffs, but I
don't know who can do that, nor whether it's at all possible.
> FWIW, I merge the current master into my branch to make sure it works
> fine. This is automated so it happens all the time, and I will rebase,
> squash, and adjust the commit messages when it's time to push the code
> to a public branch.
I don't see why you need all that. The final merge onto master needs
to be tested anyway, so the best practice IME is not to merge from
master during development.
> But all that is not relevant, there are many ways to generate noise
> in scratch branches.
Well, the best way to combat the noise is not to generate it in the
first place.
next prev parent reply other threads:[~2016-07-02 6:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160701173748.21438.91559@vcs.savannah.gnu.org>
[not found] ` <20160701173750.9F5F1220067@vcs.savannah.gnu.org>
2016-07-01 17:47 ` scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Ted Zlatanov
2016-07-01 18:46 ` Eli Zaretskii
2016-07-01 19:53 ` Ted Zlatanov
2016-07-02 6:29 ` Eli Zaretskii [this message]
2016-07-05 2:38 ` Ted Zlatanov
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83inwotuwm.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.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://git.savannah.gnu.org/cgit/emacs.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).