-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/transaction nonce #230
Conversation
# Conflicts: # go.mod # go.sum
# Conflicts: # go.mod # go.sum
# Conflicts: # go.mod # go.sum
# Conflicts: # go.mod # go.sum
# Conflicts: # go.mod # go.sum
# Conflicts: # go.mod # go.sum
# Conflicts: # cmd/updateallocation.go # go.mod # go.sum
# Conflicts: # cmd/newallocation.go # cmd/updateallocation.go # go.mod # go.sum
# Conflicts: # go.mod # go.sum
@dabasov there too many commits for merging code from staging, the commit history will be clearer if we rebase and merge those commits from staging. |
Can we do it right in the github merging pull request? there is squash commits feature, think it can work in this case |
yes, sure, we can do it in github |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Manual system tests [success] with the following config
|
A brief description of the changes in this PR:
Tasks to complete before merging PR:
Associated PRs (Link as appropriate):