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

Language Validation - Issue #7 #14

Merged
merged 1 commit into from Sep 1, 2017

Conversation

devinmatte
Copy link
Owner

@devinmatte devinmatte commented Sep 1, 2017

@saifat29 I reverted your pull request because your local git config is not the same as your GitHub. Please fix your commit to have the proper account.

I want you to be credited for your work. Feel free to ask me questions in this thread if you're having issues.

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

@devinmatte I have fixed my email address locally. I can't understand this fix your commit issue. What do I do now?

@devinmatte
Copy link
Owner Author

devinmatte commented Sep 1, 2017

@saifat29 Run this: git checkout language-validation then git rebase -i HEAD~1 and change pick to edit
Then run git commit --amend --author="Author Name <email@address.com>" then git rebase --continue should finish the rebase. Then git push --force

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

I think it's done. Can you check?

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

I think I messed it up. :(
I need to learn Git as early as possible.

@devinmatte
Copy link
Owner Author

devinmatte commented Sep 1, 2017

@saifat29 It still looks invalidated. You're setting it to the same email as your GitHub account? This might help. Make sure you're working in the correct branch

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

I got the problem.

@devinmatte devinmatte closed this Sep 1, 2017
@devinmatte devinmatte reopened this Sep 1, 2017
@devinmatte devinmatte moved this from Completed to In Progress in Version 1.0 Sep 1, 2017
@devinmatte
Copy link
Owner Author

@saifat29 Feel free to take your time. This seems like a good learning opportunity. I updated some of my past comments to be more descriptive so hopefully that can help if you get stuck.

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

I think I've resolved the issue about my commits being not correct.
The problems that I understood were as follows -

  1. My git email id on my machine wasn't the same as my Github email.
  2. I was committing in my other branch and not the master branch.
  3. So the other branch had updated code, but the master branch was left behind.
    I updated my email id and then I merged the other branch into the master branch.
    So now my master branch has the latest commit.

Can you please check.

@devinmatte
Copy link
Owner Author

devinmatte commented Sep 1, 2017

@saifat29 The commits on your master branch are a little all over the place.
Here's my request:
Fix the commit in your separate branch. You should be able to do it without having more than 1 commit.
I want to merge a single commit instead of 4.

This should work: git checkout language-validation then git rebase -i HEAD~1 and change pick to edit
Then run git commit --amend --author="Author Name <email@address.com>" then git rebase --continue should finish the rebase. Then git push --force

@saifat29
Copy link
Contributor

saifat29 commented Sep 1, 2017

I think it's done. Now there's only one commit.

@devinmatte devinmatte merged commit 576a144 into devinmatte:master Sep 1, 2017
@saifat29 saifat29 deleted the language-validation branch September 1, 2017 17:17
@devinmatte devinmatte moved this from In Progress to Completed in Version 1.0 Sep 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Version 1.0
  
Completed
Development

Successfully merging this pull request may close these issues.

None yet

2 participants