[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] master 94ed516 2/4: Merge branch 'master' of git.sv.gn
|
From: |
Artur Malabarba |
|
Subject: |
Re: [Emacs-diffs] master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
|
Date: |
Tue, 6 Oct 2015 18:01:18 +0100 |
On 6 Oct 2015 5:20 pm, "Stefan Monnier" <address@hidden> wrote:
>
> > Quick question. Could someone explain to me what the subject of this
> > email means?
> >> master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
> > Is that what you get when you merge the remote's master onto your
> > local master?
>
> Yes.
>
> For that reason, it is much better to merge your branch into a clone of
> "master" than the other way around.
Yes. Doing your work on a separate dev branch (and pulling master before merging dev onto master) is an important piece of git workflow. Perhaps we ought to document that in the same place we teach people to clone the repo?