Comments (3)
1.远程是否存在some-feature分支?
开发过程中,可以把本地 feature分支 push到远程
- 远程可以作为备份
- 方便其它同学看到,可以review修改
- 如果用pull request或是其它同学做合并,需要有远程分支
2.那么在小红完成发布中,本地release-0.1分支是否应该在本地master分支合并完成之后,先合并来自远程develop分支的代码,然后本地develop分支合并本地release-0.1分支,然后提交?
完整类型的分支体现在:
上面的图主要 看的是 修改内容 在分支之间的流向(流向就是合并来完成),梳理就是:
- master => hotfix => develop/master
- develop => feature => develop => release => develop/master
总结一下,流向目标都是 develop/master,区别是 develop分支是面向开发的完整收集,而master是面向发布的完整收集。
你提到的分支类型是 release(release-0.1)、master、develop,梳理就是(上面完整梳理的一部分):
release => develop/master
理解这个过程 可以先不管分支是 远程 还是 本地。
要注意的是,在合并时,本地分支要和远程分支是一致的,即可(避免合并时丢了提交)。
from translations.
我的意思是develop分支在开出release之后,有提交更新,那之后release分支要合并回来,是否应该先从develop分支合并新的提交?还是直接就合并回develop分支(感觉对合并不同分支,不是很理解)?
from translations.
之后release分支要合并回develop,是否应该先从develop分支合并新的提交?还是直接就合并回develop分支?
对于develop分支,上面2种方式是一样的。
对于release(比如release-0.1)分支合并到master,打了tag后就可以删除,没有必要去合并develop分支。
感觉对合并不同分支,不是很理解
如果只是对 分支合并 不是很理解: 多做一下合并操作,多看看合并的出来的效果,多理解一下就好了 :)(要理解的是 合并操作后历史树的变化)
Gitflow本身比较复杂,理解合并操作,可以先从简单的工作流【集中式/功能分支工作流】开始。
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.