hi, i was attempting to incorporate a new upstream release of r-cran-bayesfactor into the package repo, but i stuffed it up. i wasn't expecting there to be changes to remote, and so didn't pull before starting.
i `gpb import-orig`ed the new release in, and then did a `push --all` the upstream, and the pristine-tar branches pushed successfully, but the master did not (due to my branch diverging from the remote). normally when i screw git up, i just `git reset HEAD~n --hard`, where n is a large number, and then pull again; this would let me start over with `gbp import-orig`, but the pristine-tar and upstream are already pushed to remote. i'm wondering what the equivalent steps are, to what `gbp import-orig` does with merging upstream into master. is it just: git merge upstream git tag -a upstream/0.9.12-2 git push --all or is there more magic? with thanks jonathon -- JASP - A Fresh Way to Do Statistics http://jasp-stats.org/ -- How happy is he born and taught, That serveth not another's will; Whose armour is his honest thought, And simple truth his utmost skill This man is freed from servile bands Of hope to rise, or fear to fall: Lord of himself, though not of lands, And, having nothing, yet hath all. -- Sir Henry Wotton
