Re: [boost] [git][multi_index] help merging from develop

Subject: Re: [boost] [git][multi_index] help merging from develop
From: Bjørn Roald (bjorn_at_[hidden])
Date: 2013-12-25 04:59:34

Right now it seems like the boost super
> project develop branch points at the
> fdd4934c234de61f8d2ba22fc3465a0ac90e11c5 commit of the multi_index
> submodule, which is the head of multi_index's develop branch, thus there
> are little risk involved in moving the master branch head if you like to
> do that.

is seems that was not correct, the super module points at your latest 
unsuccessful merge commit in master.

Cloning into 'libs/multi_index'...
remote: Counting objects: 3622, done.
remote: Compressing objects: 100% (1519/1519), done.
remote: Total 3622 (delta 2075), reused 3435 (delta 1903)
Receiving objects: 100% (3622/3622), 1.42 MiB | 566 KiB/s, done.
Resolving deltas: 100% (2075/2075), done.
Submodule path 'libs/multi_index': checked out 
'3239677c40b6e15d1bb49675cabb077460333538'

> git checkout master
> git checkout -b trash/bad-master
>
> git checkout master
> git reset --hard fix-merge
> git push -f
>
> If you want to ensure the bad commit stays on github server:

So if you decide to move the master head, I would do this.

> git checkout trash/bad-master
> git push

to prevent git from removing your old master branch commits from github.

-- 
Bjørn