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

chore: fix dev merge conflict w/ main branch #74

Merged
merged 32 commits into from
Apr 2, 2024
Merged

Conversation

RanbirAulakh
Copy link
Collaborator

Issue #, if available:

Description of changes:

  • Rebased dev with main branch and fix some of the merge conflicts

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

drduhe and others added 30 commits January 8, 2024 13:55
…uctured-logging

feat: output structured logs with job context
BREAKING CHANGE: Properties on the GeoJSON features output from ModelRunner updated to follow model developers guide.
BREAKING CHANGE: Properties on the GeoJSON features output from ModelRunner updated to follow model developers guide.
chore: update copyright
chore: update copyright
@RanbirAulakh RanbirAulakh changed the base branch from main to dev April 2, 2024 19:35
@RanbirAulakh RanbirAulakh changed the base branch from dev to main April 2, 2024 19:46
drduhe
drduhe previously approved these changes Apr 2, 2024
Copy link
Collaborator

@drduhe drduhe left a comment

Choose a reason for hiding this comment

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

LGTM

@RanbirAulakh RanbirAulakh changed the base branch from main to dev April 2, 2024 20:43
@RanbirAulakh RanbirAulakh dismissed drduhe’s stale review April 2, 2024 20:43

The base branch was changed.

@RanbirAulakh RanbirAulakh changed the base branch from dev to main April 2, 2024 20:43
Copy link
Collaborator

@drduhe drduhe left a comment

Choose a reason for hiding this comment

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

LGTM

@RanbirAulakh RanbirAulakh merged commit a015310 into main Apr 2, 2024
@RanbirAulakh RanbirAulakh deleted the dev-merge-conflict branch April 2, 2024 20:50
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.

4 participants