git rebase 技巧

git rebase

出现大量问题信息

---

---

先放弃吧

还是摘车厘子

---

---

To abort and get back to the state before “git rebase”, run “git rebase --abort”.

git rebase --abort

---

---

---

---

---

---

至于，pod 文件配置，方面的问题

结合 pod 的工作流程

pod install 是怎么运作的

历史回退 + 撤销修改

➜  ios git:(djz_room) git cherry-pick commit_b         
error: commit commit_b is a merge but no -m option was given.
fatal: cherry-pick failed
➜  ios git:(djz_room) git cherry-pick commit_c


➜  ios git:(djz_room) git checkout commit_a  --  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/hahaha.xcodeproj
➜  ios git:(djz_room) ✗ git checkout commit_a  --  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/Pods/Pods.xcodeproj
➜  ios git:(djz_room) ✗ git checkout commit_a  --  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/hahaha.xcworkspace



➜  ha ha ha git:(djz_room) ✗ git checkout commit_a  --  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/Podfile.lock




➜  hahaha git:(djz_room) ✗ git checkout commit_a  --  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/Pods/Manifest.lock
➜  hahaha git:(djz_room) ✗ pod install

再手动，把新建的文件，添加上去