[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gn
Re: scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Sat, 02 Jul 2016 09:29:29 +0300
> From: Ted Zlatanov <address@hidden>
> 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