Difference between revisions of "User:Kebap/git commands"

From Mudlet
Jump to navigation Jump to search
(+2)
Line 11: Line 11:
 
: git push --set-upstream origin myNewFeature
 
: git push --set-upstream origin myNewFeature
 
: git push
 
: git push
 +
: handle the github pull request
 +
: git branch -d myNewFeature
  
 
; Why does "git status" report "Your branch is ahead of 'origin/development' by X commits." and how to remedy?
 
; Why does "git status" report "Your branch is ahead of 'origin/development' by X commits." and how to remedy?
 
: You probably pulled origin/development back into your branch to introduce recent upgrades? Use "git pull --rebase" to flatten them and "git log" to verify
 
: You probably pulled origin/development back into your branch to introduce recent upgrades? Use "git pull --rebase" to flatten them and "git log" to verify

Revision as of 15:20, 8 January 2021

Usual workflow
git pull
git branch myNewFeature
git checkout myNewFeature
work on myNewFile
git status
git add myNewFile
git commit -m "My awesome comment"
git status
rinse and repeat
git push --set-upstream origin myNewFeature
git push
handle the github pull request
git branch -d myNewFeature
Why does "git status" report "Your branch is ahead of 'origin/development' by X commits." and how to remedy?
You probably pulled origin/development back into your branch to introduce recent upgrades? Use "git pull --rebase" to flatten them and "git log" to verify