Skip to content

feat: make LazyLoadVersion validate InitialVersion the same as LoadVersion (backport #638)#669

Merged
tac0turtle merged 2 commits intorelease/v0.20.xfrom
mergify/bp/release/v0.20.x/pr-638
Jan 30, 2023
Merged

feat: make LazyLoadVersion validate InitialVersion the same as LoadVersion (backport #638)#669
tac0turtle merged 2 commits intorelease/v0.20.xfrom
mergify/bp/release/v0.20.x/pr-638

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2023

This is an automatic backport of pull request #638 done by Mergify.
Cherry-pick of d8e1e38 has failed:

On branch mergify/bp/release/v0.20.x/pr-638
Your branch is up to date with 'origin/release/v0.20.x'.

You are currently cherry-picking commit d8e1e38.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   mutable_tree.go
	modified:   mutable_tree_test.go
	modified:   nodedb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify
feat: make LazyLoadVersion validate InitialVersion the same as `L…
6774bf1 
…oadVersion`

Co-authored-by: Marko <marbar3778@yahoo.com>
Closes #637

(cherry picked from commit d8e1e38)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team January 30, 2023 14:01
@mergify mergify bot added the conflicts label Jan 30, 2023
@mergify mergify bot mentioned this pull request Jan 30, 2023
Merged
tac0turtle
tac0turtle reviewed Jan 30, 2023
View reviewed changes
@tac0turtle tac0turtle merged commit 7afdfcd into release/v0.20.x Jan 30, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.20.x/pr-638 branch January 30, 2023 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@tac0turtle tac0turtle tac0turtle approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

conflicts

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@tac0turtle