emacs-devel
[Top][All Lists]
Advanced

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

Re: master has switched from Automake to GNU Make


From: martin rudalics
Subject: Re: master has switched from Automake to GNU Make
Date: Mon, 27 Mar 2017 21:29:43 +0200

> Then I don't understand why Git would force you to commit.  IME, it
> happens only when the pulled changes modify the same places as your
> uncommitted changes.  And even then I'm given a choice of committing
> or stashing; the latter will allow to leave your changes uncommitted,
> if you "git stash pop" after pulling.

That's been my experience too.  For some reason either the merge or the
autocommit fails.  Sometimes because git detects trailing whitespace in
the pulled code.  Other times without telling me any reason but that my
terminal is dumb.

> What version of Git do you have installed?

1.7.10.4

martin



reply via email to

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