search

Soltis13 / OnTheGoApp

ontheGoApp This App is created for people to find information quickly and easily Who is your target audience? People on the GO. Looking for a quick information... What is the problem that the product will address? Google maps takes more time and needs user to type information
1 stars 1 forks source link

Git Branch Work Flow (from Class) #11

Closed Soltis13 closed 6 years ago

Soltis13 commented 6 years ago

Below is a summary of the notes from class on how to pull a new branch and upload to github for approval.

Initial Setup

  1. Go into the the Group2Project page on my github and clone the rep to your local drive

New Edit

  1. pull down latest master branch: git pull origin master

  2. check out your own working branch: git checkout -b my-new-branch

  3. when you’re done working, pull down latest version of master (others may have made changes while you were working) git pull origin master

  4. merge the newly updated local version of master into your working branch: (while your current branch is my-new-branch!) git merge master

  5. resolve merge conflicts if necessary. open file in code if conflicts are listed in git bash. Conflicts should show up as highlighted

  6. add your changes to the new branch git add .

  7. commit your changes localy git commit -m "put commits here"

  8. push your working branch to github git push origin my-new-branch

  9. and finally create a pull request on github to merge my-new-branch into master. Choose one other team member as a reviewer.

Lisa-jo commented 6 years ago

Thank you!!