git CLI

git commit -m "描述"

git add .

git checkout develop

❯ 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.

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

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

❯ git pull
fatal: refusing to merge unrelated histories

git pull origin main --allow-unrelated-histories