我需要帮助尝试复制我在bitbucket上使用github时遵循的流程
我在这两种服务上都有帐户和项目。我试图在Bitbucket项目上复制我的GitHub流量,但到目前为止还不可能。 GIT管理是相同的,但是在网络上使用GUI接受PRS时出现问题或差异。
我的github流量如下:
- 我克隆了我通常具有
Master
和开发
分支的项目 - 。
- 我创建一个具有新功能的代码的
功能/
分支, - 我从该
feature/
分支创建一个拉动请求来开发 - 拉动请求,由对等式或客户端审查。
- 如果PR还可以,则请确保随着开发的形式重新重新重新使用
功能/
分支,并继续与在本地开发
进行合并,然后推动开发到遥控器。 github
知道,具有功能/
分支的PR已与开发合并,并将PR标记为合并。- 我去PR删除分支。
即使我删除了分支,我也可以看到封闭的PR(GUI)的代码更改。从理论上讲,我可以在将来需要恢复该分支,以防万一我需要它。但是当我做
时,分支将不会作为活动分支。git分支-r
我尝试在bitbucket中做到这一点,这只是一团糟。
执行第6号后。Bitbucket不会将PR更新为合并。没有选择关闭PR。只有一个选项批准
,<代码>拒绝或Merge
。但是我不想使用GUI合并是繁琐的。我宁愿手动合并。
因此,现在我们正在做的是降低
prs。并添加一条消息,说PR是手动合并的。但这对我感到难过。
另一件事是我有很多分支,如果我删除已拒绝的PR的分支,那么与该分支相关的PR将显示为空的,没有提交!因此历史丢失了。
Bitbucket提出的流量有所不同吗?我应该在这里改变一些东西吗?
我正在尝试获取有关人们使用Bitbucket而不是GitHub的更多信息。
提前致谢。
I have both accounts and projects on both services. I try to replicate my Github flow on bitbucket projects but so far it has not been possible. The git management is the same, but the issues or differences appear when using the GUI on the web to accept PRs.
My Github flow is as follows:
- I clone the project
- I usually have
master
anddevelop
branches. - I create a
feature/
branch with code of a new feature - I create a pull request from that
feature/
branch to develop - The pull request is reviewed by a peer or client.
- If the PR is ok, I make sure the
feature/
branch is rebased with develop and proceed to merge withdevelop
locally and then push develop to the remote. GITHUB
knows that the PR with thefeature/
branch has been merged with develop and marks the PR as merged.- I go to the PR and delete the branch.
Even though I deleted the branch, I can see the code changes from the closed PR (GUI). And I could in theory
restore
that branch in the future in case I need it. But the branch won't be there as an active branch when I dogit branch -r
I try to do that in bitbucket and it is just a mess.
After doing number 6. Bitbucket does not update the PR to merged. There is no option to close a PR. There is only an option to approve
, decline
, or merge
. But I do not want to merge using the GUI is to cumbersome. I would rather merge manually.
So now what we are doing is declining
PRs. And adding a message that says that the PR was merged manually. But this feels bad to me.
The other thing is that I have a lot of branches, and if I delete a branch of a PR that has been declined then the PR that is associated with that branch will appear as empty with no commits! So history is lost.
Is bitbucket proposed flow different? Should I change something here?
I am trying to get more information about what is the common flow people follow when using bitbucket rather than Github.
Thanks in advance.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论