[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging emacs-24
From: |
Stephen J. Turnbull |
Subject: |
Re: merging emacs-24 |
Date: |
Fri, 28 Nov 2014 12:29:02 +0900 |
Stephen J. Turnbull writes:
> David Engster writes:
> > I think the easiest way to avoid this is to merge the remote branch
> > instead of the local tracking one.
>
> It is mathematically impossible to merge a remote branch,
Oops, did you mean "git pull" here?
- Re: merging emacs-24, (continued)
- Re: merging emacs-24, Eli Zaretskii, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/28
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28
- Re: merging emacs-24, Sergey Organov, 2014/11/28
- Re: merging emacs-24, David Kastrup, 2014/11/28
- Re: merging emacs-24, Stefan Monnier, 2014/11/27
- Re: merging emacs-24, David Engster, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/27
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Stephen J. Turnbull, 2014/11/27
- Re: merging emacs-24,
Stephen J. Turnbull <=
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/28
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28
- Re: merging emacs-24, Stefan Monnier, 2014/11/28
- Re: merging emacs-24, Glenn Morris, 2014/11/29
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Paul Eggert, 2014/11/29
- Re: merging emacs-24, Glenn Morris, 2014/11/29
- Re: generating Chan(was: merging emacs-24), Paul Eggert, 2014/11/29