Bjørn Roald
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 To https://github.com/boostorg/multi_index.git ! [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 Telefónica Digital