Skip to content

codehbs/git-workflow

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

5 Commits
 
 

Repository files navigation

Good Git Hygene

As a member of CODE, you'll likely do some of your work in teams -- and you know what that means: version control. For people who are new to working in git, we put together a sample workflow.

If you're not familiar with git, here's a good overview on git on Quora.

Sample Workflow

  • Name the branch after the feature you're creating: git checkout -b "your-initials/name-of-feature" (you will need the quotes when you create a new branch name)

  • Code your feature

  • Check the status of your changes: git status

  • Add the feature updates: git add --patch

  • Then go back to the master branch: git checkout master

  • Pull down all changes from master: git pull origin master. This is an important step! This makes sure you are handling all (if any) merge conflicts on your computer

  • Merge the master branch with your feature branch: git checkout your-initials/name-of-feature and then merge your branch: git merge master your-initials/name-of-feature. If you have conflicts, you will see an alert. Resolve the conflicts.

  • Then push up your feature branch: git push origin your-initials/name-of-feature. Note: never type git push origin master. Don't be that person who pushes to master :)

  • Create a pull request on GitHub. Ask a teammate to approve your request.

Bonus

Read about merging vs. rebasing.

About

Sample git workflow for working in teams

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published