Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Thu, 18 Dec 2014 20:46:51 +0100
> 
> > What really worries me about all this is that I _know_ some of the
> > more-or-less veteran contributors do have long-living branches, where
> > they do all their work, and from where they merge to master before
> > pushing.  For those people, using "pull --rebase" might be trouble
> > waiting to happen at the most inopportune moment.
> 
> Indeed,... unless you can break them of the habit of merging master into
> the feature branch before merging with master...?

Unlikely.  My take of that workflow is that those people try to keep
'master' pristine, so they won't want to merge there until they are
really ready to push; any real work gets done on a branch.

> If they always merge from the feature branch into master and then push,
> they will be safe.  They can merge back from master after they have
> successfully pushed master.

They must merge from master before the push, to test the merge
results.