Skip to content

Fix: Resolve Conflicts Census Bureau Acs#414

Merged
nlarge-google merged 17 commits into
GoogleCloudPlatform:mainfrom
Naveen130:census_bureau_acs
Jul 13, 2022
Merged

Fix: Resolve Conflicts Census Bureau Acs#414
nlarge-google merged 17 commits into
GoogleCloudPlatform:mainfrom
Naveen130:census_bureau_acs

Conversation

@Naveen130

@Naveen130 Naveen130 commented Jul 13, 2022

Copy link
Copy Markdown
Contributor

Description

Fix to resolve merge conflicts

Checklist

  • (Required) This pull request is appropriately labeled
  • Please merge this pull request after it's approved

Use the sections below based on what's applicable to your PR and delete the rest:

Data Onboarding

  • I'm adding or editing a dataset
  • The Google Cloud Datasets team is aware of the proposed dataset
  • I put all my code inside datasets/census_bureau_acs and nothing outside of that directory

@Naveen130 Naveen130 self-assigned this Jul 13, 2022
@Naveen130 Naveen130 requested a review from nlarge-google July 13, 2022 14:55
@nlarge-google nlarge-google merged commit 492b973 into GoogleCloudPlatform:main Jul 13, 2022
@adlersantos

adlersantos commented Jul 14, 2022

Copy link
Copy Markdown
Member

@nlarge-google @Naveen130 We should not approve or merge PRs that resolve conflicts - git conflicts are always a result of your local git's configuration or some improper handling of branches or commits, and never a defect of the main trunk. Plus, this PR has no changes introduced. Just an FYI for future awareness.

vijay-google pushed a commit to vijay-google/public-datasets-pipelines that referenced this pull request Aug 17, 2022
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.

3 participants