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.

Sign up for GitHub

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

Jump to bottom

chore: bump stage to production #209

Merged
merged 1 commit into from
Feb 20, 2024
Merged

chore: bump stage to production #209

merged 1 commit into from
Feb 20, 2024

Conversation

stehessel
Copy link
Contributor

Bumping stage -> production manually due to merge conflicts between stage and production.

@stehessel stehessel requested a review from a team as a code owner February 19, 2024 21:42
@stehessel stehessel changed the title chore: remove probe instances from table (#205) chore: bump stage to production Feb 19, 2024
@janisz
Copy link
Contributor

janisz commented Feb 20, 2024

Bumping stage -> production manually due to merge conflicts between stage and production.

If we promote stage to production how it's possible to have conflicts?

@stehessel
Copy link
Contributor Author

If we promote stage to production how it's possible to have conflicts?

I think someone merged to production by squash so it rewrites the history.

@janisz janisz self-requested a review February 20, 2024 14:23
janisz
janisz requested changes Feb 20, 2024
View reviewed changes
Copy link
Contributor

@janisz janisz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a question

@janisz janisz enabled auto-merge February 20, 2024 14:24
@janisz janisz merged commit 6c4c368 into production Feb 20, 2024
1 check passed
@janisz janisz deleted the chore/sync-stage-with-production branch February 20, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janisz janisz janisz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stehessel @janisz