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.

Sign up for GitHub

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

Jump to bottom

Add two-fer exercise #114

Merged
merged 5 commits into from
Feb 8, 2019
Merged

Add two-fer exercise #114

merged 5 commits into from
Feb 8, 2019

Conversation

jonmcalder
Copy link
Member

Add two-fer exercise
Update config.json
Run configlet (resulting in some out of date readme's being updated)

@katrinleinweber katrinleinweber self-assigned this Feb 8, 2019
katrinleinweber
katrinleinweber reviewed Feb 8, 2019
View reviewed changes
Copy link
Contributor

@katrinleinweber katrinleinweber left a comment

Choose a reason for hiding this comment

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

The exercise works fine, thank you :-)

In the interest of history clearness I would prefer it we spliced out the configlet results from the two-fer commit. I'll try it with the author & committer options ;-)

katrinleinweber and others added 3 commits February 8, 2019 18:24
@katrinleinweber
Revert d0b04a1 & 552c6be
8554996 
This reverts commits "Add newline to EOF" & "Add two-fer exercise, update config.json and run configlet"
@jonmcalder @katrinleinweber
Add two-fer exercise
a1b0dab
@jonmcalder @katrinleinweber
Run configlet
bd3f28f
katrinleinweber
katrinleinweber approved these changes Feb 8, 2019
View reviewed changes
Copy link
Contributor

@katrinleinweber katrinleinweber left a comment

Choose a reason for hiding this comment

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

How about this one? If we merge normally it will still look messy below, but at least the main commits are more atomic. I was at Git-Merge last week ;-)

@jonmcalder
Copy link
Member Author

Ok cool - thanks. Yeah sorry, I should have split it out into separate commits.

@jonmcalder jonmcalder merged commit e35cba7 into master Feb 8, 2019
@katrinleinweber katrinleinweber deleted the add-two-fer branch February 8, 2019 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@katrinleinweber katrinleinweber katrinleinweber approved these changes

Assignees

@katrinleinweber katrinleinweber

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jonmcalder @katrinleinweber