[bind10-dev] Order of merging

[Yoshitaka Aharen]

Hello,

The latter way is shown in the wiki page:
<https://bind10.isc.org/wiki/GitWorkflow#Merging>

If it's not suitable, we should update the page.

Regards,

On Mon, 21 Jan 2013 16:54:18 +0100
"Michal 'vorner' Vaner" <michal.vaner at nic.cz> wrote:

> Hello
> 
> I'd like to ask for one small thing. When you're merging a branch, to master, do
> that and not the other way around, eg:
> 
> $ git checkout master
> $ git merge tracXXXX
> 
> Not:
> $ git checkout tracXXXX
> $ git merge master
> $ git checkout master
> $ git merge tracXXXX
> 
> The second creates stupid message of merging master to branch, while the other
> is actually true. Also, with doing the second, if you use some graphical history
> browser (like qgit, gitk, gitview, …), the master branch moves from place to
> place. With the first approach, the master stays on the left side all the time,
> making it much more understandable.
> 
> Also, if we ever want to employ some script to extract changelog from the merges
> to master, it would be easier if the master always followed on the first parent,
> eg. on the left.
> 
> Or, is there any reason to do it the other way around? Could we add this
> suggestion to some style guide?
> 
> Thank you
> 
> -- 
> I've already told you more than I know.
> 
> Michal 'vorner' Vaner

-- 
Yoshitaka Aharen <aharen at jprs.co.jp>
Japan Registry Services Co., Ltd.