git CLI

1

git commit -m "描述"

1

git add .

1

git checkout develop

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

❯ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

1
2

git config --global user.name PolloChang
git config --global user.email [email protected]

1

git config --global core.editor "vim" # 設定編輯 commit message 用 vim 文字編輯器

1
2

❯ git pull
fatal: refusing to merge unrelated histories

1

git pull origin main --allow-unrelated-histories