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

Delete simpleSampleData #419

Merged
merged 2 commits into from
Feb 6, 2023

Conversation

rowan04
Copy link
Contributor

@rowan04 rowan04 commented Jan 18, 2023

Resolves #415 Merge after #394

  • the simpleSampleData is no longer needed, so can be deleted

@rowan04 rowan04 requested a review from a team as a code owner January 18, 2023 16:31
@rowan04
Copy link
Contributor Author

rowan04 commented Jan 18, 2023

The INSTALL.md file needs to be edited - however the same section was edited in the unmerged pr #394. How should I go about editing the file without conflicting the two branches?

@gregcorbett
Copy link
Member

You can either do the edit now and resolve the conflict when #394 is merged (maybe git will be able to resolve it for you 🤞 ) or wait until #394 is merged then edit the INSTALL.md file.

@rowan04
Copy link
Contributor Author

rowan04 commented Jan 19, 2023

You can either do the edit now and resolve the conflict when #394 is merged (maybe git will be able to resolve it for you 🤞 ) or wait until #394 is merged then edit the INSTALL.md file.

I reckon it will be easier/better to wait until #394 is merged, then edit the file, as even the edits made in 394 need to overridden (as the list wont be needed)

@gregcorbett
Copy link
Member

You can either do the edit now and resolve the conflict when #394 is merged (maybe git will be able to resolve it for you 🤞 ) or wait until #394 is merged then edit the INSTALL.md file.

I reckon it will be easier/better to wait until #394 is merged, then edit the file, as even the edits made in 394 need to overridden (as the list wont be needed)

Can you update the INSTALL.md file now that #394 has been merged 😄 ?

Copy link
Member

@gregcorbett gregcorbett left a comment

Choose a reason for hiding this comment

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

LGTM, just the INSTALL.md change 😄

@rowan04
Copy link
Contributor Author

rowan04 commented Feb 6, 2023

You can either do the edit now and resolve the conflict when #394 is merged (maybe git will be able to resolve it for you 🤞 ) or wait until #394 is merged then edit the INSTALL.md file.

I reckon it will be easier/better to wait until #394 is merged, then edit the file, as even the edits made in 394 need to overridden (as the list wont be needed)

Can you update the INSTALL.md file now that #394 has been merged 😄 ?

Yes, I was just thinking that

@rowan04
Copy link
Contributor Author

rowan04 commented Feb 6, 2023

ok so my merging and rebasing has gone wrong as usual and there is a conflict after all.

@rowan04 rowan04 force-pushed the 415-delete-simple-sample-data branch from 6c120d5 to 33979f0 Compare February 6, 2023 15:36
- the simpleSampleData is no longer needed, so can be deleted
- As the simpleSampleData has been deleted, the information about it in INSTALL.md can be deleted
- This meant the text about the sample data as a whole needed to be reworded
@rowan04 rowan04 force-pushed the 415-delete-simple-sample-data branch from 33979f0 to aa41a30 Compare February 6, 2023 15:42
@gregcorbett gregcorbett self-assigned this Feb 6, 2023
@gregcorbett gregcorbett added this to the June 2023 milestone Feb 6, 2023
@gregcorbett gregcorbett merged commit 51d01fb into GOCDB:dev Feb 6, 2023
@rowan04 rowan04 deleted the 415-delete-simple-sample-data branch August 16, 2023 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Delete simpleSampleData
2 participants