堆栈内存溢出
  简体   繁体   English

如何在简单的 git 流程中合并修补程序分支

[英]how to merge a hotfix branch in simple git flow

 原文  2020-08-18 17:56:06  2   1    git

问题描述

a team works on a simple git flow with release , develop , feature and hotfix branches:一个团队使用release 、 develop 、 feature和hotfix分支处理一个简单的 git 流程：

  • develop is based on release develop基于release
  • feature is based on develop feature基于develop
  • hotfix is based on release hotfix基于release

to merge the hotfix branch they have these options:要合并hotfix分支，他们有以下选项：

  1. merge hotfix into both release and develop将hotfix合并到release和develop中
  2. merge hotfix into release then merge release into develop将hotfix合并到release ，然后将release合并到develop中
  3. merge hotfix into release then rebase develop on top of release将hotfix合并到release ，然后在release之上重新develop

which option is the best and why?哪个选项最好，为什么？

1 个解决方案

解决方案1
 0 已采纳  2020-08-18 22:19:34

I think you should merge hotfix into release (the branch it's based on), and then your develop branch should be updated based on release (the branch develop is based on) new state. And the same to feature : updated based on develop .我认为您应该将hotfix合并到release （它所基于的分支）中，然后您的develop分支应该根据release （分支develop基于）new state 进行更新。与feature相同：基于develop进行更新。 Disclaimer: this is my opinion.免责声明：这是我的意见。

暂无
暂无

声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

相关问题 如何别名git flow hotfix finish [current_hotfix_branch] - how to alias git flow hotfix finish [current_hotfix_branch] Git Flow Share修补程序分支 - Git flow share hotfix branch Git 将修补程序分支合并到功能分支 - Git merge hotfix branch into feature branch Git流工作流 - 修补程序与分支权限冲突 - Git flow workflow - hotfix conflicts with branch permissions git flow hotfix 后快进合并 - Fast forward merge after git flow hotfix Git-Flow撤消已完成/合并的修补程序分支 - Git-Flow undo a finished/merged hotfix branch git 修补程序分支的用途 - purpose of git hotfix branch Git Flow Hotfix - Peer Review＆merge into remote master＆develop - Git Flow Hotfix - Peer Review & merge into remote master & develop 将更改的文件从功能合并到修补程序git flow - Merge changed files from feature to a hotfix git flow Git将修补程序分支合并到功能分支，然后删除修补程序分支？ - Git merging hotfix branch into feature branch, then removing hotfix branch?
相关标签
 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM