git coaching

[noudess]

So I did a fork, pulled down a local copy, made changes, committed locally and then did a push to my fork.

Then, I did a pull request. That request is still open.

Question. I just fixed a completely separate bug and commited that locally. If I do a push to my fork, will that pollute my existing pull request? If not, can I create a second pull request for just the new change?

I'm totally new to git.

Thx.

[Kingly_Krab]

If you push and overwrite, the new changes should be in the same pull request.

[noudess]

That's the issue. I don't think you guys want changes that are unrelated to each other in a pull. I could be wrong. My current pull request is for 1 issue. I figure you guys don't need to see stuff nixed together.

I didnt want to push the bug fix and have it land in the other pull request.

[KLS]

Was waiting on merging it cause demon had raised some concerns but in the meantime branching is your friend

Creating a branch with name "some_feature_branch_name"

git checkout -b some_feature_branch_name


To move back to master

git checkout master


To switch back to branch and merge changes from master you just got

git checkout some_feature_branch_name


To say merge code from master after you've updated it

git merge master


You can setup pull requests to use your own named branches instead of master.

Also: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging