[Top][All Lists]

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

Re: A simple git workflow for the rest of us

From: Achim Gratz
Subject: Re: A simple git workflow for the rest of us
Date: Sun, 16 Nov 2014 15:36:52 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux)

Lars Magne Ingebrigtsen writes:
> And now the push.  I see that I was mistaken last time -- it did
> actually push my trunk change, but it's complaining about the emacs-24
> branch, where I have no changes and that I didn't want to push.
> So...  is the hint it's giving the correct thing to do, or is there some
> further configuration I should have done on the trunk to avoid these
> messages?

Consult the documentation on the push.default configuration (git help
config), you don't want "matching" in a configuration that has permanent
new-workdirs attached.

> So "git pull" on the "new-workdir"'ed branch made pushing on the trunk
> stop giving error messages.  Which is kinda fun.

The same would have happened if you had updated the emacs-24 branch in
the master repository.  Remember that the "new-workdir" really is
working on your base repository.

+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Blofeld:

reply via email to

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