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

README: update for concept exercises #1083

Merged
merged 5 commits into from
Aug 14, 2022
Merged

README: update for concept exercises #1083

merged 5 commits into from
Aug 14, 2022

Conversation

pwadsworth
Copy link
Contributor

Adds concepts and concept exercises entries.

Corrects folder structure to include concepts.

README.md Outdated Show resolved Hide resolved
@petertseng petertseng mentioned this pull request Aug 14, 2022
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@pwadsworth
Copy link
Contributor Author

pwadsworth commented Aug 14, 2022

Finally starting to get the hang of putting PRs.in order. Thanks for the patience!

Copy link
Member

@petertseng petertseng left a comment

Choose a reason for hiding this comment

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

Of course. One of the things I find in open source is that patience and understanding is needed from both sides, because most of it is volunteer work. Just as I have to guide all contributors to do their best work, I have to also be thankful that they're willing to put in the time at all and put up with the changes I ask for, even if I may seem ungrateful.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@pwadsworth
Copy link
Contributor Author

Corrected link and alignment. Tripled checked and found no other problems 🤞

pwadsworth and others added 5 commits August 14, 2022 22:55
vertical line under directory should align with that directory

This commit is part of #1083
Should have been done with 2ef2c03,
which was a part of #936

This commit is part of #1083
@petertseng petertseng changed the title Updates README README: update for concept exercises Aug 14, 2022
@petertseng petertseng merged commit 9a8e2ea into exercism:main Aug 14, 2022
petertseng pushed a commit that referenced this pull request Aug 14, 2022
petertseng pushed a commit that referenced this pull request Aug 14, 2022
vertical line under directory should align with that directory

This commit is part of #1083
petertseng added a commit that referenced this pull request Aug 14, 2022
petertseng pushed a commit that referenced this pull request Aug 14, 2022
Should have been done with 2ef2c03,
which was a part of #936

This commit is part of #1083
@petertseng
Copy link
Member

Great, thanks

@pwadsworth
Copy link
Contributor Author

@petertseng: The commits you made left my fork 5 commits ahead of exercism/haskell (plus 1 when I merged), but there are no changes in the files. What is the correct way forward? do I make another pull request with the 6 commits and no file changes or reset (read delete and fork again) my fork?

@pwadsworth
Copy link
Contributor Author

I am going to go with option 2. There are other differences with my local repos and I lost track of which one is which.

@petertseng
Copy link
Member

You could reset, but the reset I had in mind doesn't involve deleting and forking again; resetting involves using git reset, potentially git reset --hard. When a word already means something in a particular context ("reset" has a specific meaning in the context of Git), using it to mean something other than its usual meaning should be avoided.

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.

2 participants