将master创建的功能分支推送到develop
我们正处于在组织中建立开发运营的起步阶段。我们有 2 个分支,分别称为“master”和“develop”,这两个分支都是空的文件夹结构。我们的开发人员从“master”分支创建了“feature”分支并开发了他们的组件。这些组件可在“功能”分支中找到。
理想情况下,开发人员应该从“开发”创建,但由于一些误解,他们从“主控”创建。
有没有办法将从“master”创建的“feature”分支推送到“develop”分支。
We are in the starting stage of setting up dev-ops in our organization. We have 2 branches called 'master' and 'develop' and both the branches are empty with folder structure. Our developers created 'feature' branch from 'master' branch and developed their components. The components are available in the 'feature' branch.
Ideally the developer should create from 'develop' but due to some misunderstanding they have created from 'master'.
Is there a way to push the 'feature' branch that was created from 'master' to 'develop' branch.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
在我们的组织中,我们遵循类似的结构,我们有
main
和develop
分支,以及feature
、release
和hotfix
分支。您提到应该从develop
分支创建feature
分支,我同意您的观点。在我看来,我建议您不要担心已经从
main
创建的分支,而是期待从develop
分支创建未来的feature
分支。我建议您,一旦完成从main
直接创建的feature
分支的工作,就向develop
提出合并请求。一旦这些分支在develop
中经过测试,然后与main
合并。In our organization we follow kinda similar structure and we have our
main
anddevelop
branch along withfeature
,release
andhotfix
branches. You mentioned thatfeature
branches should be created fromdevelop
branch and I agree with you.In my opinion I would suggest you not to worry about the already created branches from the
main
but look forward to create futurefeature
branches fromdevelop
branch. I suggest you, once the work is done withfeature
branches which are directly created frommain
, raise merge requests todevelop
. Once those branches are tested indevelop
then merge withmain
.