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

Adding HINTS.md to palindrome-products exercise #278

Merged
merged 10 commits into from
Apr 5, 2017

Conversation

jmbradnan
Copy link
Contributor

Adding HINTS.md to palindrome-products exercise (#209). Let me know if hint makes sense or needs to be tweaked. thx

@@ -0,0 +1,5 @@
## Hints

For this exercise, you will need to create a set of factors using Tuples.
Copy link
Member

Choose a reason for hiding this comment

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

Could you replace Tuples with tuples (lowercase)?


For this exercise, you will need to create a set of factors using Tuples.

For more information on Tuples, see [this link](https://msdn.microsoft.com/en-us/library/system.tuple(v=vs.110).aspx).
Copy link
Member

Choose a reason for hiding this comment

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

Could you replace Tuples with tuples (lowercase)?

## Hints

For this exercise, you will need to create a set of factors using Tuples.

Copy link
Member

Choose a reason for hiding this comment

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

Please remove this empty line.

@ErikSchierboom ErikSchierboom merged commit a8947f9 into exercism:master Apr 5, 2017
@ErikSchierboom
Copy link
Member

Thanks! 🎉

@jmbradnan
Copy link
Contributor Author

@ErikSchierboom quick question for you - it looks like 10 commits were merged with this change (all of my previous ones), am I reading that correctly? Those should have been merged already so want to make sure I am not doing something weird with my branches.

@jmbradnan jmbradnan deleted the palindrome-hints branch April 5, 2017 08:42
@ErikSchierboom
Copy link
Member

@jmbradnan Well, actually it does look like you are doing something weird with your branches :) In this case, as those commits were already merged, it doesn't really matter. But, normally I would expect to see one commit in the PR. Having those other commits in the PR means that the branch on which the PR is based was not up-to-date with the latest exercism/master branch.

Earlier, I suggested you do the following to create a new branch:

git checkout master
git fetch exercism
git reset --hard exercism/master
git checkout -b <your-branch>

Did you do that?

Another option is to do the following while being on your branch:

git fetch exercism
git rebase exercism/master

This will rebase your commits on the latest master, which is precisely what we want. However, rebasing is a bit of an advanced Git feature. You can read more about it here: https://git-scm.com/docs/git-rebase

@jmbradnan
Copy link
Contributor Author

yes I did follow your first set of steps, I am really not sure what is happening seems pretty straightforward. I was going to pick up one more of these, I will try rebase first and see if it makes a difference.

@ErikSchierboom
Copy link
Member

@jmbradnan Hmmm, very weird. And what do you see when you enter: git remote -v?

@jmbradnan
Copy link
Contributor Author

@ErikSchierboom
Copy link
Member

Hmmm, looking good. Well, let's try again with the next PR :)

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