git master和main 的纠缠

➜  springbootTrading git:(master) ✗ git status
On branch master

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .gitignore
        .mvn/
        mvnw
        mvnw.cmd
        pom.xml
        src/

nothing added to commit but untracked files present (use "git add" to track)
➜  springbootTrading git:(master) ✗ git add .
➜  springbootTrading git:(master) ✗ git commit -m "init project"
[master (root-commit) 42aaf48] init project
 10 files changed, 713 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd
 create mode 100644 pom.xml
 create mode 100644 src/main/java/com/stan/springboottrading/SpringbootTradingApplication.java
 create mode 100644 src/main/resources/application.properties
 create mode 100644 src/test/java/com/stan/springboottrading/SpringbootTradingApplicationTests.java
➜  springbootTrading git:(master) git push origin master
fatal: 'origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
➜  springbootTrading git:(master) git remote add origin git@github.com:stanbers/springbootTrading.git
➜  springbootTrading git:(master) git fetch
Warning: Permanently added the RSA host key for IP address '140.82.114.3' to the list of known hosts.
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 580 bytes | 290.00 KiB/s, done.
From github.com:stanbers/springbootTrading
 * [new branch]      main       -> origin/main
➜  springbootTrading git:(master) git checkout main
Branch 'main' set up to track remote branch 'main' from 'origin'.
Switched to a new branch 'main'
➜  springbootTrading git:(main) ✗ git merge master
fatal: refusing to merge unrelated histories
➜  springbootTrading git:(main) ✗ git merge master --allow-unrelated-histories
Merge made by the 'recursive' strategy.
 .gitignore                                                                      |  33 ++++++++++++++++
 .mvn/wrapper/MavenWrapperDownloader.java                                        | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 .mvn/wrapper/maven-wrapper.jar                                                  | Bin 0 -> 50710 bytes
 .mvn/wrapper/maven-wrapper.properties                                           |   2 +
 mvnw                                                                            | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mvnw.cmd                                                                        | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml                                                                         |  41 +++++++++++++++++++
 src/main/java/com/stan/springboottrading/SpringbootTradingApplication.java      |  13 ++++++
 src/main/resources/application.properties                                       |   1 +
 src/test/java/com/stan/springboottrading/SpringbootTradingApplicationTests.java |  13 ++++++
 10 files changed, 713 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd
 create mode 100644 pom.xml
 create mode 100644 src/main/java/com/stan/springboottrading/SpringbootTradingApplication.java
 create mode 100644 src/main/resources/application.properties
 create mode 100644 src/test/java/com/stan/springboottrading/SpringbootTradingApplicationTests.java
➜  springbootTrading git:(main) git status
On branch main
Your branch is ahead of 'origin/main' by 2 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
➜  springbootTrading git:(main) git branch
➜  springbootTrading git:(main) git pull origin main
From github.com:stanbers/springbootTrading
 * branch            main       -> FETCH_HEAD
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
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.
Already up to date.
➜  springbootTrading git:(main) git config --global pull.rebase false
➜  springbootTrading git:(main) git config --global pull.ff only
➜  springbootTrading git:(main) git push origin main
Enumerating objects: 29, done.
Counting objects: 100% (29/29), done.
Delta compression using up to 8 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (28/28), 52.67 KiB | 7.52 MiB/s, done.
Total 28 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), done.
To github.com:stanbers/springbootTrading.git
   1d440b9..c3862a1  main -> main
➜  springbootTrading git:(main) git branch
➜  springbootTrading git:(main) git -delete master
unknown option: -delete
usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           [--super-prefix=<path>] [--config-env=<name>=<envvar>]
           <command> [<args>]
➜  springbootTrading git:(main) git --delete master
unknown option: --delete
usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           [--super-prefix=<path>] [--config-env=<name>=<envvar>]
           <command> [<args>]
➜  springbootTrading git:(main) git -d master
unknown option: -d
usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           [--super-prefix=<path>] [--config-env=<name>=<envvar>]
           <command> [<args>]
➜  springbootTrading git:(main) git branch -d master
Deleted branch master (was 42aaf48).
➜  springbootTrading git:(main) git status
On branch main
Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean
➜  springbootTrading git:(main) git branch
➜  springbootTrading git:(main) 
➜  springbootTrading git:(main)