Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS

[Philip Kaludercic]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Philip Kaludercic <philipk@posteo.net>
>> Cc: monnier@iro.umontreal.ca,  emacs-devel@gnu.org
>> Date: Sun, 16 Oct 2022 22:22:42 +0000
>> 
>> > From the shell prompt, "git pull" will fail if the changes are in the
>> > same file as one of those whose changes are brought in by the pull,
>> > but either using --rebase or maybe the stash/pull/unstash dance should
>> > take care of that, I guess?
>> 
>> Right, I believe it was something along these lines but this is
>> something that is difficult to automate.
>
> Can you elaborate on the "difficult" part?  You could always stash any
> local changes before pulling, then un-stashing them after.  This
> should work reliably, I think?

Difficult in the sense that to my knowledge there is no --dwim flag to
tell Git to try and avert a conflict at any cost.  Instead you would
have to know what the right operation is depending on the current state
of the repository and the kinds of conflicts that pulling creates.