GIT 遇到问题

GIT 遇到问题

• > git pull --tags
  From https://gitee.com/gdgmzwx/react-project-demo
   * [new branch]      master     -> origin/master
  There is no tracking information for the current branch.
  Please specify which branch you want to merge with.
  See git-pull(1) for details.
  
      git pull <remote> <branch>
  
  If you wish to set tracking information for this branch you can do so with:
  
      git branch --set-upstream-to=origin/<branch> main
  1
  2
  3
  4
  5
  6
  7
  8
  9
  10
  11
  12

  git branch --set-upstream-to=origin/<远程分支> 本地分支

  git branch --set-upstream-to=origin/master main

• > git pull --tags origin master
  From https://gitee.com/gdgmzwx/react-project-demo
   * branch            master     -> FETCH_HEAD
  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
  3
  4
  5
  6
  7
  8
  9
  10
  11
  12
  13
  14
  15
  16

  git config pull.rebase false

• > git pull --tags origin master
  From https://gitee.com/gdgmzwx/react-project-demo
   * branch            master     -> FETCH_HEAD
  fatal: refusing to merge unrelated histories
  1
  2
  3
  4

  git pull origin master --allow-unrelated-histories

  
  

@蚵仔煎-20231106