@amrtanair thanks again for doing this. I think there just a couple more things that should be tightened up. Please let me know if you need help.

@amrtanair one thing to know-- it shouldn't necessary to create a new pull request for each set of edits. You should be able to just edit the existing branch patch-2 and commit it.

Ideally the all commits for your changes would be squashed in to one-- if I can help you do that please let me know.

I would really like to know how to do it that way. Could you please tell me
how? I tried editing the existing branch but I think I was going about it
the wrong away. It would be great if you could help me.

Regards,
Amrita H Nair

On Mon, Mar 7, 2016 at 10:57 PM, Matthew Morgan notifications@github.com
wrote:

@amrtanair https://github.com/amrtanair one thing to know-- it
shouldn't necessary to create a new pull request for each set of edits. You
should be able to just edit the existing branch patch-2 and commit it.

Ideally the all commits for your changes would be squashed in to one-- if
I can help you do that please let me know.

—
Reply to this email directly or view it on GitHub
#103 (comment).

Regards,
Amrita H Nair

Closed by #104

Usually you do things in this order:

fork the exercism/xjava repo, then in your local command line:

git clone https://github.com/amrtanair/xjava
//then create and check out a new branch to do your work on.  Give it a sensible name
git branch my-awesome-update
git checkout my-awesome-update
//...make your changes, run the tests as described in the Contributing Guide
//now push your local branch with your local changes back up to your fork on GitHub
git push origin my-awesome-update

You can now make the pull request. We'll review it, suggest changes or ask questions, and you can make those changes locally. When you're done, commit your new changes to your local branch then roll everything in to one commit.

To combine your new changes with the old:

1. reset your git HEAD to the last commit on master:

git log
//you should see something like this:
commit c4b10d7d0b7b30b85843e67adcf0dbf120a432ae
Author: amrtanair <amritaanair98@gmail.com>
Date:   Mon Mar 7 12:38:30 2016 +0530

    Updated ABOUT.md

    Made some edits to my changes


commit 00ec4082ed62bfb8ba7f56eaced3b4868efc54f8
Author: amrtanair <amritaanair98@gmail.com>
Date:   Mon Mar 7 10:38:30 2016 +0530

    Updated ABOUT.md

    corrected the mistakes

commit b03f4f1d7254b8406e30a4dc68ca53598615e369
Merge: 2becaf4 c4b10d7
Author: Katrina Owen <katrina.owen@gmail.com>
Date:   Sun Mar 6 12:53:46 2016 -0700

    Merge pull request #99 from exercism/new-exercise-simple-linked-list

    Add new exercise simple linked list

The ref BEFORE the first commit you made (EG the one that reflects the repo when you forked it) is the one to which you want to reset, in this case: b03f4f1

You will reset, and then make a new commit with a new message that will roll up all your changes since you forked.

git reset --soft b03f4f1
git commit -am 'Updated contents of ABOUT.md'

2. Now push to the branch on your fork

git push -f origin my-awesome-update

When you've taken the final step (push -f) your branch on your fork will update, and the PR will be changed automatically. Travis will re-run the tests, and we'll review again. Once the review-change cycle is done, we merge the PR.

Does that make sense?

Yes, that did help me a lot. I had been confused for a long time on how to
roll all my commits into one. I will surely implement this the next time I
contribute :)

Regards,
Amrita H Nair

On Tue, Mar 8, 2016 at 12:10 AM, Matthew Morgan notifications@github.com
wrote:

Usually you do things in this order:

fork the exercism/xjava repo, then in your local command line:

git clone https://github.com/amrtanair/xjava
//then create and check out a new branch to do your work on. Give it a sensible name
git branch my-awesome-update
git checkout my-awesome-update
//...make your changes, run the tests as described in the Contributing Guide
//now push your local branch with your local changes back up to your fork on GitHub
git push origin my-awesome-update

You can now make the pull request. We'll review it, suggest changes or ask
questions, and you can make those changes locally. When you're done, commit
your new changes to your local branch then roll everything in to one commit.

To combine your new changes with the old:

1. reset your git HEAD to the last commit on master:

git log
//you should see something like this:
commit c4b10d7
Author: amrtanair amritaanair98@gmail.com
Date: Mon Mar 7 12:38:30 2016 +0530

Updated ABOUT.md

Made some edits to my changes

commit 00ec408
Author: amrtanair amritaanair98@gmail.com
Date: Mon Mar 7 10:38:30 2016 +0530

Updated ABOUT.md

corrected the mistakes

commit b03f4f1
Merge: 2becaf4 c4b10d7
Author: Katrina Owen katrina.owen@gmail.com
Date: Sun Mar 6 12:53:46 2016 -0700

Merge pull request #99 from exercism/new-exercise-simple-linked-list

Add new exercise simple linked list

The ref BEFORE the first commit you made (EG the one that reflects the
repo when you forked it) is the one to which you want to reset, in this
case: b03f4f1
b03f4f1

You will reset, and then make a new commit with a new message that will
roll up all your changes since you forked.

git reset --soft b03f4f1
git commit -am 'Updated contents of ABOUT.md'

2. Now push to the branch on your fork

git push -f origin my-awesome-update

When you've taken the final step (push -f) your branch on your fork will
update, and the PR will be changed automatically. Travis will re-run the
tests, and we'll review again. Once the review-change cycle is done, we
merge the PR.

Does that make sense?

—
Reply to this email directly or view it on GitHub
#103 (comment).

Regards,
Amrita H Nair

Awesome. Feel free to reach out if you get stuck or have any questions.