Started new branch "A" about coursenotes HOT 9 CLOSED

Network link: https://github.com/chanana/courseNotes/network

from coursenotes.

@chanana,

Ok I did all of the steps on my end and then I merged my master branch with my B and pushed it to the github master branch. After you do the rest of the steps, you'll have to do the pull 1st before pushing part.

from coursenotes.

@morrowcj

• pair up with one other student in the class
• decide which git repository to work on: class note repo from one or the other student, say student A
• student A goes to her/his own repository, clicks on “Settings” then “Collaborator” (github might ask for your password) then enters the gihub user name for student B, then click “Add collaborator”: to give push access to student B
• 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 [done by B];
• tag the instructor & TA on this issue, give both student names.

Edited because completed

from coursenotes.

I guess I did too but the steps are in order so I'm not sure if the TA/Instructor will check that they all happened in that order.

from coursenotes.

~@morrowcj ~
Undid some stupid things I did and merged. I think we should both be good now. Please check once and then either go ahead and tag 'em or I can do it. Sorry for complicating this unnecessarily!

Ok turns out I shouldn't have merged B again. So I'll un-merge that and let you merge it again. Sorry again!

Edit: I think we should start a new project...

from coursenotes.

@chanana, I just looked at the network and I think you just need to merge your version of A into the master branch, fix any conflicts, pull the upstream changes and fix conflicts again, and then push. Then we should be done.

But if you want to start a new project to make the network a bit cleaner, that's ok too.

from coursenotes.

@morrowcj, I merged my branch with the master branch and pushed.

from coursenotes.

• TA - @coraallencoleman and
• Instructor: @cecileane
• Students:
  • @chanana Shaurya Chanana and
  • @morrowcj Clay Morrow
• Network Link

from coursenotes.

beautiful network, and beautiful checklist! 💯

from coursenotes.