Skip to content

Remove assertion from ~LockedPageManager#396

Closed
crowning- wants to merge 0 commit intodashpay:v0.12.0.xfrom
crowning-:v0.12.0.x
Closed

Remove assertion from ~LockedPageManager#396
crowning- wants to merge 0 commit intodashpay:v0.12.0.xfrom
crowning-:v0.12.0.x

Conversation

@crowning-
Copy link

@UdjinM6
Copy link

UdjinM6 commented Jul 3, 2015

I would prefer git cherry-pick 881027a to have a nice history instead of creating yet another commit from scratch :)
smth like that UdjinM6@05b31b7

@crowning-
Copy link
Author

Didn't know the cherry-pick option...I'll try that.

Edit: Hmh, obviously I'm missing something: "fatal: bad revision '881027a'"

@UdjinM6
Copy link

UdjinM6 commented Jul 3, 2015

@crowning- add bitcoin as a remote, fetch it and then cherry-pick

@crowning-
Copy link
Author

I already tried that:

git remote add upstream https://github.com/bitcoin/bitcoin.git
fatal: remote upstream already exists.

No, I've never added it before...
Anyway, a direct

git fetch https://github.com/bitcoin/bitcoin.git

did the job.

The commit looks a bit odd now because no file was changed, but I guess we can live with that.

@UdjinM6
Copy link

UdjinM6 commented Jul 4, 2015

errr... I thought of replacing you commit with cherry-pick, not adding it to yours actually
smth like this (using stash is optional - it should save your current work if you have smth uncommitted):

git stash
git reset --hard HEAD^
git cherry-pick 881027a
git push crowning- HEAD -f
git stash apply

since now you now have 2 commits already:
git reset --hard HEAD^ should actually be done twice or replaced with git reset --hard HEAD~2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants