面试官:git rebase 和 merge区别

# 1.正常的提交流程
git add file.txt
git commit -m "初始提交"

# 2.发现需要修改，使用amend
git add file.txt # 或其他文件的修改
git commit --amend -m "更新后的提交信息"

git push

https://github.com/watchpoints/master-cpp/blob/main/weekly1-cpp/day4/day4-cpp11.cpp

111111
22222
33333

连续提交3次

gitlog--oneline

3883436fix:3333

0b7b9bafix:2222

ba4be4dfix:11111

gitrebase-i[<startpoint>] [<endpoint>]


>pick d2cf1f9 fix: 第一次提交
>
>s 47971f6 fix: 第二次提交
>
>s fb28c8d fix: 第三次提交

上面的意思就是把第二次、第三次提交都合并到第一次提交上

gitpush-foriginmain

git rebase -i ba4be4dcbc8cf2bad37bbdd3874e59914040ba2c 
error: cannot rebase: You have unstaged changes.error: 
Please commit orstash them

这个错误表示你有未暂存的更改，
Git 拒绝执行 rebase 操作来保护你的工作内容

解决：
git add -A
git add -u

git status 查看很多差异：


Changes notstaged forcommit:

  (use "git add/rm <file>..."to update what will be committed)

  (use "git restore <file>..."to discard changes in working directory)

modified:   .gitignore

deleted:    cpp/chapt-2/02_thead.c

deleted:    cpp/chapt-2/03_thead.c

deleted:    cpp/chapt-2/04_lock.cpp

deleted:    cpp/chapt-2/CMakeLists.txt

deleted:    cpp/chapt-2/my_dlopen.c

deleted:    cpp/chapt-2/my_dlopen.cpp

deleted:    cpp/chapt-2/my_dlopen_default.cpp

deleted:    cpp/chapt-3-thread-local/2_thread.cpp

deleted:    cpp/chapt-3-thread-local/3_if.cpp

deleted:    cpp/chapt-3-thread-local/3_if.s

deleted:    cpp/chapt-3-thread-local/CMakeLists.txt

deleted:    cpp/chapt-3-thread-local/therad1.cpp

deleted:    cpp_weekly/EP1-10/CMakeLists.txt

deleted:    cpp_weekly/EP1-10/ep01_string_view.cpp

deleted:    cpp_weekly/EP1-10/ep01_string_view_2.cpp

deleted:    cpp_weekly/README.md

# Commands:# p, pick <commit> = use commit# r, reword <commit> = use commit, but edit the commit message# e, edit <commit> = use commit, but stop for amending# s, squash <commit> = use commit, but meld into previous commit# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous#                    commit's log message, unless -C is used, in which case#                    keep only this commit's message; -c is same as -C but#                    opens the editor# x, exec <command> = run command (the rest of the line) using shell# b, break = stop here (continue rebase later with 'git rebase --continue')# d, drop <commit> = remove commitpick c50221f commit Bpick 73deeed commit Cpick d9623b0 commit Dpick e7c7111 commit Epick 74199ce commit F# 变基 ef13725..74199ce 到 ef13725（5 个提交）## 命令:# p, pick <提交> = 使用提交# r, reword <提交> = 使用提交，但修改提交说明# e, edit <提交> = 使用提交，进入 shell 以便进行提交修补# s, squash <提交> = 使用提交，但融合到前一个提交# f, fixup <提交> = 类似于 "squash"，但丢弃提交说明日志# x, exec <命令> = 使用 shell 运行命令（此行剩余部分）# b, break = 在此处停止（使用 'git rebase --continue' 继续变基）# d, drop <提交> = 删除提交......

cat .git/config

[remote "origin"]
url =git@github.com:watchpoints/master-cpp.git
fetch =+refs/heads/*:refs/remotes/origin/*
//存储位置
//我自己建立项目

[branch "main"]
remote = origin
merge = refs/heads/main

# 同事在远程创建了分支 feature/payment，你需要下载到本地
git fetch origin
git checkout -b feature/payment origin/feature/payment

# 现在你就在本地的 feature/payment 分支上，且与远程分支建立了跟踪

feature/payment 这个分支名称