[Top][All Lists]

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

Re: master has switched from Automake to GNU Make

From: Eli Zaretskii
Subject: Re: master has switched from Automake to GNU Make
Date: Sun, 26 Mar 2017 22:16:44 +0300

> Date: Sun, 26 Mar 2017 21:01:48 +0200
> From: martin rudalics <address@hidden>
> CC: address@hidden, address@hidden, 
>  address@hidden
>  > I'm not sure I follow: are you saying that you use "git pull" into
>  > local branches that don't track the master branch?  If so, why are you
>  > doing that?
> Doing what?  I have three versions of master - one pristine, one used
> for development with changes I eventually intend to push, and a private
> one with changes I don't intend to push.  For the non-pristine ones I
> practically always pull into the branch and only occasionally pull into
> the master, usually when I want to make a diff.  Is that bad?

Are the non-pristine branches tracking master, or are they different
branches forked from master?  If the latter, you shouldn't be pulling
into them, I think, you should be merging from master.

reply via email to

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