Skip to content
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

refactor: Import existing branch metadata from ref storage #95

Merged

Conversation

twavv
Copy link
Contributor

@twavv twavv commented Apr 27, 2023

Per title.

Also fixed a forgotten tx.Commit in stack tidy as well as added a line of output to that command.

@aviator-app
Copy link
Contributor

aviator-app bot commented Apr 27, 2023

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This PR was merged using Aviator.

Stack

  1. 👉 refactor: Import existing branch metadata from ref storage #95 👈 (this pr)

@twavv twavv force-pushed the travis/mer-2228-import-existing-branch-metadata-from branch from 27c94fa to b7a0ceb Compare April 27, 2023 14:56
@twavv twavv changed the title feat: Import existing branch metadata from ref storage refactor: Import existing branch metadata from ref storage Apr 27, 2023
@twavv twavv requested a review from draftcode April 27, 2023 15:05
@twavv twavv marked this pull request as ready for review April 27, 2023 15:12
@twavv twavv force-pushed the travis/mer-2228-import-existing-branch-metadata-from branch from 40cbff3 to dc5aa2a Compare May 2, 2023 18:41
@twavv
Copy link
Contributor Author

twavv commented May 3, 2023

/aviator stack merge

@aviator-app aviator-app bot changed the base branch from travis/mer-2210-wire-db-store to master May 3, 2023 17:34
@aviator-app aviator-app bot added the blocked label May 3, 2023
@aviator-app
Copy link
Contributor

aviator-app bot commented May 3, 2023

This pull request failed to merge: merge conflict detected, please resolve manually and requeue. Remove the blocked label to re-queue.

Additional debug info: Failed to merge changes from the base branch into this PR. You will probably need to merge the latest changes from the base branch into the PR branch and manually resolve conflicts).

@twavv twavv force-pushed the travis/mer-2228-import-existing-branch-metadata-from branch from dc5aa2a to ebeeb93 Compare May 3, 2023 17:42
@twavv
Copy link
Contributor Author

twavv commented May 3, 2023

/aviator stack cancel

@twavv twavv changed the base branch from master to travis/mer-2210-wire-db-store May 3, 2023 17:42
@twavv twavv force-pushed the travis/mer-2228-import-existing-branch-metadata-from branch from ebeeb93 to 30705a5 Compare May 3, 2023 17:57
@twavv
Copy link
Contributor Author

twavv commented May 3, 2023

/aviator stack merge

@twavv twavv removed the blocked label May 3, 2023
@aviator-app aviator-app bot changed the base branch from travis/mer-2210-wire-db-store to master May 3, 2023 17:59
@aviator-app aviator-app bot merged commit ca898d4 into master May 3, 2023
@aviator-app aviator-app bot deleted the travis/mer-2228-import-existing-branch-metadata-from branch May 3, 2023 17:59
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