Subject: Re: [boost] [git][multi_index] help merging from develop
From: Joaquin M Lopez Munoz (joaquin_at_[hidden])
Date: 2013-12-24 15:11:38
BjÃ¸rn Roald <bjorn <at> 4roald.org> writes:
> On 12/24/2013 06:17 PM, BjÃ¸rn Roald wrote:
> > right, see my reply to Peter on this, copy-paste error of mine. Should
> > have been.
> > git reset --hard 3239677c40b6e15d1bb49675cabb077460333538
> OK, I try again.
> git reset --hard 802543fd948b5cf41460addf2260693f08cf7f8d
Did that, merged from develop, resolved conflicts as theirs (develop's),
commited OK but push failed with
git.exe push --progress "origin" master:master
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/boostorg/multi_index.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
git did not exit cleanly (exit code 1) (13510 ms @ 24/12/2013 21:09:27)
JoaquÃn M LÃ³pez MuÃ±oz
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk