https://github.com/guppster/gitmodel

Clear and easy to follow guide for new developers working in my team
https://github.com/guppster/gitmodel

Last synced: 10 months ago
JSON representation

Clear and easy to follow guide for new developers working in my team

• Host: GitHub
• URL: https://github.com/guppster/gitmodel
• Owner: Guppster
• Created: 2016-06-13T00:53:18.000Z (over 9 years ago)
• Default Branch: master
• Last Pushed: 2016-06-13T00:53:44.000Z (over 9 years ago)
• Last Synced: 2025-01-12T06:24:05.282Z (12 months ago)
• Size: 0 Bytes
• Stars: 0
• Watchers: 2
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

          
Git Model

=====================

Create a feature branch

-----------------------

Create new branch

    git checkout master

    git pull

    git checkout -b myfeature

Once completed committing changes, merge into master

    git checkout master

    git pull

    git merge --no-ff myfeature

    git branch -d myfeature

    git push origin master

OR create a pull request and let another dev review and merge

    git checkout master

    git pull

    git checkout myfeature

    git rebase master

You might have conflicts when rebasing into master. Fix each one and add them:

    git add 

    

    git rebase --continue

Once you have rebased successfully you can push the branch to github

    git push origin myfeature

Login into github and you will see the branch that you just pushed. Create a pull request and wait for the code to be revie