emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: vc-dir operation is very slow on large git repositories in Emacs 26.


From: Eli Zaretskii
Subject: Re: vc-dir operation is very slow on large git repositories in Emacs 26.1
Date: Thu, 28 Jun 2018 16:38:07 +0300

> Cc: address@hidden, address@hidden, address@hidden,
>  address@hidden
> From: Dmitry Gutov <address@hidden>
> Date: Thu, 28 Jun 2018 16:18:52 +0300
> 
> On 6/28/18 4:12 PM, Eli Zaretskii wrote:
> 
> > Yes, and I still don't think I understand what "unmerged" means in
> > this context.  Can you explain?  To me, "merging" only has meaning
> > when more than one branch is considered, or two instances of a single
> > branch that diverged.
> 
> And what does the "conflict" status mean to you?

You are saying that "unmerged" alludes to files that failed to merge,
i.e. "in conflict" in our parlance?  If so, fine with me.  I just
wonder why didn't Git documentation say so.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]