[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Having a custom merge process
From: |
Eli Zaretskii |
Subject: |
Re: Having a custom merge process |
Date: |
Sat, 26 Dec 2015 11:47:58 +0200 |
> From: Lars Ingebrigtsen <address@hidden>
> Date: Sat, 26 Dec 2015 00:40:24 +0100
>
> John Wiegley <address@hidden> writes:
>
> > I've used Git in many scenarios, on many projects, but some of the practices
> > we're using here for Emacs development I've never seen before. This simply
> > makes me wonder how much of that difference is truly necessary, or is a
> > result
> > of having evolved to this point from CVS and then Bazaar.
>
> I think the latter is probably true. There are many people here who
> aren't that fond of git. (I'm one of them. :-)) And that's probably
> somewhat unusual, these days.
But the merge policies and what gitmerge.el does (and bzrmerge.el did
before it) were defined by people who are neither non-lovers of Git
nor are prisoners of the CVS-like way of thinking. Those policies are
determined by the project needs first and foremost, not by what the
tools can or cannot do well.
So I don't see how this conclusion could be right.
But again, without having a list of "surprising" practices, it's hard
to reason about this.
> Hey! It's time for a new 500+ article VC thread!
Yes. Long time no seen.
- Re: EWW bugs should be fixed on emacs-25 branch, (continued)
- Re: EWW bugs should be fixed on emacs-25 branch, David Engster, 2015/12/25
- Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), John Wiegley, 2015/12/25
- Re: Having a custom merge process, Lars Ingebrigtsen, 2015/12/25
- Re: Having a custom merge process, David Engster, 2015/12/25
- Re: Having a custom merge process, John Wiegley, 2015/12/25
- Re: Having a custom merge process, Paul Eggert, 2015/12/26
- Re: Having a custom merge process,
Eli Zaretskii <=
- Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), Eli Zaretskii, 2015/12/26
- EWW To Elpa? Re: Having a custom merge process, raman, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, Lars Ingebrigtsen, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, Artur Malabarba, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, John Wiegley, 2015/12/28
- Re: EWW To Elpa? Re: Having a custom merge process, Artur Malabarba, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, raman, 2015/12/27
- Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), Richard Stallman, 2015/12/26
- Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), Eli Zaretskii, 2015/12/26
Re: EWW bugs should be fixed on emacs-25 branch, Lars Ingebrigtsen, 2015/12/25