Bitbucket 自动合并来自发布分支的拉取请求
我有问题。您如何处理Bitbucket的“自动合并”选项。
我的问题：
因此，释放/1.1上的错误检测具有发行版的POM版本。如果我在审核之后创建拉动请求以relase/1.1分支等，则应将错误合并以将分支和主机归为主体，但这将是冲突。
您有任何解决此问题的提示吗？因为当人们必须再次解决POM版本冲突时，此选项是没有用的。
I have question. How do you deal with "Automatic merge" option from bitbucket.
My problem:
So bug detection on release/1.1 have pom version of release branch. If I create pull request to relase/1.1 branch after review etc, bug should be merged to relase branch and master to but here it will be conflict.
Do you have any tip to resolve this ? Becouse this option is useless when person have to again resolve conflict in pom version.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
如果您的自动合并将始终（通常是）造成冲突，那么我同意您的价值大大降低。但是，我不会说这是“没用的”。当合并冲突发生时，Bitbucket会为您创建拉动请求，如果没有其他提醒您您需要自己完成合并。
旁注：自动合并功能旨在自动化合并 downstream 与其他“下部”版本分支和/或最后降落在分支上，例如
开发如果存在。通常，Master将被视为上游Release分支。这不会改变问题或答案，如果您愿意，您仍然可以按照描述的方式使用它。只需确保您实际上确实想自动化在每个已完成的PR中的Master中 Release 。If your automated merge would always (or oftentimes) result in a conflict, then I agree with you that the value is greatly lessened. However, I wouldn't go as far as saying it's "useless". When a merge conflict occurs BitBucket creates a Pull Request for you, which if nothing else serves as a reminder that you need to complete the merge yourself.
Side Note: the automatic merge feature is intended to automate merging downstream to other "lower" release branches and/or finally landing on a branch like
developif one exists. Typically,masterwould be considered upstream to areleasebranch. This doesn't change the question, or the answer, and you can still use it the way you described if you wish. Just make sure you actually do want to automate merging intomasterfor every completed PR intorelease.