Skip to content

Do not update README.md and amalgamate_demo.cpp from amalgamate.sh - #1070

Merged
jkeiser merged 1 commit into
simdjson:masterfrom
pps83:bugfix/Do-not-update-README-and-amalgamate_demo
Aug 6, 2020
Merged

Do not update README.md and amalgamate_demo.cpp from amalgamate.sh#1070
jkeiser merged 1 commit into
simdjson:masterfrom
pps83:bugfix/Do-not-update-README-and-amalgamate_demo

Conversation

@pps83

@pps83 pps83 commented Jul 25, 2020

Copy link
Copy Markdown
Contributor

README.md and amalgamate_demo.cpp are always the same, there is no point to keep a copy and recreate them from amalgamate.sh

@pps83
pps83 force-pushed the bugfix/Do-not-update-README-and-amalgamate_demo branch 2 times, most recently from 2c675f7 to 5c31bce Compare July 28, 2020 15:14
Comment thread singleheader/amalgamate.sh
Comment thread singleheader/amalgamate.sh
Comment thread singleheader/amalgamate.sh

@jkeiser jkeiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just need to copy README and I think we're good. Super glad to see amalgamate_demo.cpp become static.

README.md and amalgamate_demo.cpp are always the same, there is no point to keep a copy and recreate them from amalgamate.sh
@pps83
pps83 force-pushed the bugfix/Do-not-update-README-and-amalgamate_demo branch from 5c31bce to 352eb4c Compare August 6, 2020 03:11
@pps83

pps83 commented Aug 6, 2020

Copy link
Copy Markdown
Contributor Author

Just need to copy README and I think we're good. Super glad to see amalgamate_demo.cpp become static.

updated

@pps83
pps83 requested a review from jkeiser August 6, 2020 18:48

@jkeiser jkeiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@TkTech thanks for doing this, and thanks for putting up with me :)

@jkeiser
jkeiser merged commit 1133c2c into simdjson:master Aug 6, 2020
@TkTech

TkTech commented Aug 6, 2020

Copy link
Copy Markdown
Member

@jkeiser wrong person :P

@jkeiser

jkeiser commented Aug 6, 2020

Copy link
Copy Markdown
Member

:embarrassed:

@pps83 thank you :)

@pps83

pps83 commented Aug 8, 2020

Copy link
Copy Markdown
Contributor Author

@jkeiser Please merge follow up fix from #1103

@pps83
pps83 deleted the bugfix/Do-not-update-README-and-amalgamate_demo branch August 8, 2020 14:13
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