Bitbucket分支的错位和冲突
我经历了git/bitbucket的奇怪行为。 我们是一个使用以下工作流程工作的小组开发人员团队：
所有功能都是从Master开始的分支中开发的。 我们有一个生产分支。 因此，要发布一个功能，我们在Bitbucket中创建2个PR： 功能 - 分支 - ＆gt;主 主 - ＆GT;生产 通常，并行开发多个功能，因此我们必须确保在合并PR之前将特征分支与主体保持一致。有时，这需要解决冲突。
我们观察到的东西：
- 创建Pr
Master-＆GT;生产bitbucket显示消息：
x立即落后于“生产”。
有时
Master和生产之间存在冲突。创建PR Bitbucket时会自动生成提交消息，并且每次包含以前合并的提交时。 即使我在分支对齐时创建PR，也会发生这种情况，这可以通过diff为空的事实来确认。
上述原因可能是什么？我不知道。 为了理解我，主和生产之间不应有冲突或错位，因为我们不直接致力于生产。
我们用于PR和分支管理的设置：
I am experiencing strange behavior of Git/Bitbucket.
We are a small team of developers working using following workflow:
All features are developed in branches started from master.
And we have a production branch.
So to publish a feature we create 2 PRs in Bitbucket:feature-branch -> mastermaster -> production
It's often that there are multiple features being developed in parallel, so we have to make sure that feature branches are aligned to master before merging the PR. Sometimes this requires resolving conflicts.
The things we observe:
- Once creating the PR
master -> productionBitbucket shows message:
X commits behind "production".Sync now.
Sometimes there is a conflict between
masterandproductionwhich is always trivially resolved.When creating the PR Bitbucket generates commit message automatically and every time it contains commits that were merged before.
This happens even if i create PR when branches are aligned, which can be confirmed by the fact that diff is empty.
What could be a cause to the above? I can't figure out.
To my understanding there should be no conflict or misalignment between master and production as we don't commit to production directly.
The settings we use for PR and branch management:
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论