Skip to content

feat: more compact exported snapshot (backport #703)#743

Merged
tac0turtle merged 2 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-703
Apr 13, 2023
Merged

feat: more compact exported snapshot (backport #703)#743
tac0turtle merged 2 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-703

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 13, 2023

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

On branch mergify/bp/release/v1.x.x/pr-703
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit b544dc0.
  (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:
	new file:   compress.go
	modified:   export_test.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

Co-authored-by: cool-developer <51834436+cool-develope@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit b544dc0)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team April 13, 2023 09:21
@mergify mergify bot added the conflicts label Apr 13, 2023
@tac0turtle tac0turtle merged commit 2e91f88 into release/v1.x.x Apr 13, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v1.x.x/pr-703 branch April 13, 2023 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant