Git branch exercise

[XiangyangLiu66]

@aldendirks Most recent commit: https://github.com/XiangyangLiu66/Stat679Notes/commit/d078f9506184925e3f5edb063b4afe3a447ec798

Changes made:

20181022, 7:33 PM (CST) A new file git_branch_exe.txt added to branch A of Stat689Notes Repo. One line of text was added to the file

List of action items(cross out when done):

• student A: start a new branch “A”, add something to it, push the branch to github
• student B: clone the repo on her/his laptop, start new branch “B”, add changes or new file to it, push the branch to github
• student A: pull branch B, add changes to it, push to github
• student B: pull branch A, add changes to it, push to github
• student A and B: each checkout master branch, merge his/her own branch into master, push to github. The second student doing this will need to pull first.
• both students: check the branches and merge on the repo’s network: click on “Insights” then “Network”; there should be at least 1 merge commit and labels for at least 3 branches: master, A and B.
• open a github issue with a link to the url with the “network” view; tag the instructor & TA on this issue, give both student names.

[aldendirks]

@XiangyangLiu66 https://github.com/XiangyangLiu66/Stat679Notes/commit/27fcdb551496ef7d82c193ffa3912d3c8a2af01a

Modificaitons - I created a new branch, branch B, and added one txt file, branch_exercise.txt, with one line of text.

List of action items(cross out when done):

• student A: start a new branch “A”, add something to it, push the branch to github
• student B: clone the repo on her/his laptop, start new branch “B”, add changes or new file to it, push the branch to github
• student A: pull branch B, add changes to it, push to github
• student B: pull branch A, add changes to it, push to github
• student A and B: each checkout master branch, merge his/her own branch into master, push to github. The second student doing this will need to pull first.
• both students: check the branches and merge on the repo’s network: click on “Insights” then “Network”; there should be at least 1 merge commit and labels for at least 3 branches: master, A and B.
• open a github issue with a link to the url with the “network” view; tag the instructor & TA on this issue, give both student names.

[XiangyangLiu66]

@aldendirks Recent commit on branch B: https://github.com/XiangyangLiu66/Stat679Notes/commit/2dcface35371eed5aa95ac158373f042d29bf0d1

Changes made:

20181023, 10:06 AM (CST) One line of text was added to the file branch_exercise.txt on Branch B

List of action items(cross out when done):

• student A: start a new branch “A”, add something to it, push the branch to github
• student B: clone the repo on her/his laptop, start new branch “B”, add changes or new file to it, push the branch to github
• student A: pull branch B, add changes to it, push to github
• student B: pull branch A, add changes to it, push to github
• student A and B: each checkout master branch, merge his/her own branch into master, push to github. The second student doing this will need to pull first.
• both students: check the branches and merge on the repo’s network: click on “Insights” then “Network”; there should be at least 1 merge commit and labels for at least 3 branches: master, A and B.
• open a github issue with a link to the url with the “network” view; tag the instructor & TA on this issue, give both student names.

[aldendirks]

@XiangyangLiu66 https://github.com/XiangyangLiu66/Stat679Notes/commit/dda580d1896fc23f9250707429c6309decfa3826

Changes made:

20181023, 8:05 PM (CST) One line of text was added to the file git_branch_exe.txt on Branch A and branch B was merged with master

List of action items(cross out when done):

• student A: start a new branch “A”, add something to it, push the branch to github
• student B: clone the repo on her/his laptop, start new branch “B”, add changes or new file to it, push the branch to github
• student A: pull branch B, add changes to it, push to github
• student B: pull branch A, add changes to it, push to github
• student A and student B: each checkout master branch, merge his/her own branch into master, push to github. The second student doing this will need to pull first.
• both students: check the branches and merge on the repo’s network: click on “Insights” then “Network”; there should be at least 1 merge commit and labels for at least 3 branches: master, A and B.
• open a github issue with a link to the url with the “network” view; tag the instructor & TA on this issue, give both student names.

[XiangyangLiu66]

@aldendirks Below is the network :

Changes made:

20181023, 9:99 PM (CST) After pulling from master branch, branch A was merged into master and change was pushed. If you are ok with the network result, I will go ahead and open an issue to complete the exercise.

List of action items(cross out when done):

• student A: start a new branch “A”, add something to it, push the branch to github
• student B: clone the repo on her/his laptop, start new branch “B”, add changes or new file to it, push the branch to github
• student A: pull branch B, add changes to it, push to github
• student B: pull branch A, add changes to it, push to github
• ~student A and student B: each checkout master branch, merge his/her own branch into master, push to github. The second student doing this will need to pull first.~
• ~both students: check the branches and merge on the repo’s network: click on “Insights” then “Network”; there should be at least 1 merge commit and labels for at least 3 branches: master, A and B.~
• open a github issue with a link to the url with the “network” view; tag the instructor & TA on this issue, give both student names.

[aldendirks]

@XiangyangLiu66 whould the network show branch A merging with master? I see that the branch A file was added to master, but why isn't that merge reflected in the network?

[XiangyangLiu66]

@aldendirks That is a bit strange. I checked the the log and it did seem to suggest that A was not merged to master although the files were somehow merged. I will look into it a bit and see what I can do about it. I will keep you posted.

[XiangyangLiu66]

@aldendirks It seems as if the merge went both ways between master and A. What I have locally is that A branch is exactly the same as the master branch. Also branch A is detached for some reason. I think we should just submit it and then ask Cecile tomorrow. What do you think?

[aldendirks]

Sure :)