[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master c6f03ed: Fix a problem in url.el without GnuTLS
From: |
Eli Zaretskii |
Subject: |
Re: master c6f03ed: Fix a problem in url.el without GnuTLS |
Date: |
Fri, 19 Dec 2014 11:16:51 +0200 |
> From: Steinar Bang <address@hidden>
> Date: Fri, 19 Dec 2014 09:09:03 +0100
>
> > But I see no reason to assume up front I'd need to back up, since we
> > are talking about a merge from the release branch, not from a
> > development branch. So I have all the reasons to believe the merge
> > will be uneventful, and there will be no conflicts most of the time.
>
> Not so much conflicts merging that way, but version number stuff always
> show up on the first merge, and sometimes later as well (it's good to
> check).
What do you mean by "version number stuff"?
> And in emacs' case there has been the ChangeLog stuff
This doesn't cause conflicts most of the time, if you use the
git-merge-changelog driver.
> > Which makes all the precautions like --no-ff and --no-commit
> > unnecessary, I think.
>
> I don't do it merging in to my own branches, but I always give published
> merges a final look-over in this way before pushing them (ie. merges
> _to_ master and release branches).
Yes, but "git show" before pushing will do it well enough.
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, (continued)
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/17
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, David Engster, 2014/12/17
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Stephen J. Turnbull, 2014/12/17
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Steinar Bang, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Steinar Bang, 2014/12/19
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS,
Eli Zaretskii <=
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Steinar Bang, 2014/12/19
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, David Engster, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Steinar Bang, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Yuri Khan, 2014/12/19
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Steinar Bang, 2014/12/19
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Eli Zaretskii, 2014/12/19
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, David Engster, 2014/12/18
- Re: master c6f03ed: Fix a problem in url.el without GnuTLS, Stefan Monnier, 2014/12/14