Comments (1)
- 如果小明和 小红的修改没有冲突,分别修改不同模块文件或者同文件的头和尾,小红是否还需要rebase?
文中也有说到,不用--rebase也是可以合并小明的修改的(你说的Case实际没有冲突),会多出一个没有实际内容的合并提交。
使用--rebase的pull,是为了生成线性的历史,这样和svn风格一致。
关于git合并是否rebase这是个风格问题,不同人不同场合有不同的想法。
可以 看看 恰当的使用git pull --rebase 避免不必要的merge记录 - stackoverflow
更多Git的资料参见:https://github.com/xirong/my-git
如果你现在不觉得是个问题无所谓哪种,可以先按指南中的来。后来自己有喜好了,再看 :)
2.如果小红提交**仓库的时候,发生冲突,rebase本地仓库,在小红提交之前的那一会,还有其他人又提交了**仓库的修改,那小红还要rebase,如何避免?
小红第一次发生冲突,rebase本地仓库且解决冲突后,已经包含了远程提交。这样,第二次又有人提交了**仓库的修改,情况就和第一次是一样的。
和SVN一样,绝大部分情况下,因为修改不同文件或是不同部分,不会有冲突。
from translations.
Related Issues (20)
- - HOT 3
- 译:CodeHaus Manifesto
- 译: A Look Into NASA’s Coding Philosophy
- 译: How Optional Breaks the Monad Laws and Why It Matters
- 整理译文: 分布式快照(Chandy-Lamport算法)
- 翻译: A practical introduction to functional programming HOT 1
- oldratlee域名已经被回收了 HOT 1
- 随机的int有问题 HOT 2
- overlapping-experiment-infrastructure-more-better-faster-experimentation 一处错误 HOT 1
- 翻译论文:Matching Objects with Patterns
- a-java-fork-join-framework 译文的一点疑问 HOT 3
- translate "Improving the Beginner’s PID – Introduction" HOT 1
- translate "State of Loom"
- translate clojure/FP articles of Uncle Bob HOT 1
- 1 HOT 10
- 翻译:The Art of Control Engineering: Science Meets Industrial Reality
- Fork/Join Typo HOT 2
- 关于Gitflow工作流中,维护分支和开发分支合并的疑问
- 翻译 TechnicalDebtQuadrant
- Java Fork/Join框架 2.1 一处笔误
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from translations.