A workflow of how to add a feature in remote repository
這是我認為git以最低程度干擾主幹的情況下進行一項改動的操作方式與指令整理,是本人在別的平台上的舊文章,分享給大家。
Git: work flow of how a feature added to a branch
full graph
PULL REMOTE TO LOCAL
NEW FEATURE BRANCH FROM LOCAL
EDIT YOUR FEATURE BRANCH (ADD, COMMIT)
LOCAL PULL REMOTE
FEATURE MERGE TO LOCAL, ALSO FIX CONFLICT
LOCAL SQUASH MERGE TO ONE COMMIT
PUSH COMMIT TO REMOTE
Note
-
Difference between fetch and pull
-
ow to check commit history
git log --oneline
- how to check commit history
git reset HEAD~<numberOfCommit>
- change last git commit message
git commit --amend -m "reset message
>second line
>third line
"
Reference
https://backlog.com/git-tutorial/tw/stepup/stepup3_1.html
gitbook