Skip to content

Remove assertion from ~LockedPageManager#397

Merged
UdjinM6 merged 1 commit intodashpay:v0.12.0.xfrom
crowning-:v0.12.0.x
Jul 4, 2015
Merged

Remove assertion from ~LockedPageManager#397
UdjinM6 merged 1 commit intodashpay:v0.12.0.xfrom
crowning-:v0.12.0.x

Conversation

@crowning-
Copy link

This assertion will occur any time that the client quits without
shutting down properly due to an error condition. As the user will
report this error instead of the error that was the root cause, it is
better to remove it.

This assertion will occur any time that the client quits without
shutting down properly due to an error condition. As the user will
report this error instead of the error that was the root cause, it is
better to remove it.
@crowning-
Copy link
Author

Sorry @UdjinM6 , replacing my first commit was not possible, so I reverted to the commit before that.

Learned that this also automatically closes the pull-request (#396) assigned to it :-/

Git is complicated...

@UdjinM6
Copy link

UdjinM6 commented Jul 4, 2015

Hmm.. reset --hard, commit and force push with-f should do the trick, I did that kind of stuff many times (though both --hard and -f is not a good practice at all but it's ok when you know what you're doing and no one else is working on that branch 😉 )... Strange it didn't work for you...

Btw there is a nice book about git http://git-scm.com/book/en/v2 (I read the v1 last year which was really helpful, I might need to have a look at v2 too though it's not yet translated properly)

Anyway, merging now 😄

UdjinM6 added a commit that referenced this pull request Jul 4, 2015
Remove assertion from ~LockedPageManager
@UdjinM6 UdjinM6 merged commit e2555fb into dashpay:v0.12.0.x Jul 4, 2015
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.

3 participants