Skip to content

Implement exercise - collatz-conjecture - #294

Merged
arcuru merged 5 commits into
exercism:masterfrom
smuroff:implement_collatz_conjecture
Jul 14, 2019
Merged

arcuru merged 5 commits into
exercism:masterfrom
smuroff:implement_collatz_conjecture

Conversation

@smuroff

@smuroff smuroff commented Jul 1, 2019

Copy link
Copy Markdown
Contributor

Hi there! I've brought new exercise collatz-conjecture ;)

@arcuru arcuru left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks fine to me, we just need to get that hooked into the track in a good place. These are pretty straightforward after you've already done one :)

I'm going to request @KevinWMatthews looks at this if he has time, we just have to make sure we coordinate this, #292 and #293, since they all are touching the CMakeLists file. We will handle that, so @marvelou-s you shouldn't need to make any changes to the CMakeLists file.

Comment thread config.json Resolved
@arcuru
arcuru requested a review from KevinWMatthews July 1, 2019 23:33
@KevinWMatthews

Copy link
Copy Markdown
Contributor

@patricksjackson , I've merged the C++14 changes from #292 into the current master branch.

I merged the new master into this branch so that implement_collatz_conjecture has the latest C++14 Travis settings, then updated this exercise's CMakeLists.txt to use C++14. I think this is the way to go.

It's probably best to leave out the sanitizer changes in #293 for now. I have a few more experiments to run before we merge those changes.

@marvelou-s I've pushed these changes to this branch. Be sure to pull (your own branch!) if you do more work. Thanks for your contribution!

@KevinWMatthews KevinWMatthews left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Updated to C++14

@arcuru
arcuru merged commit 70eaf41 into exercism:master Jul 14, 2019
@arcuru

arcuru commented Jul 14, 2019

Copy link
Copy Markdown
Contributor

@iHiD We merged a new exercise, I think you still need to kick off an update script manually?

@marvelou-s Thanks!

@smuroff
smuroff deleted the implement_collatz_conjecture branch July 16, 2019 17:28
@iHiD

iHiD commented Jul 23, 2019

Copy link
Copy Markdown
Member

Done. Thanks :)

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