How to stop merging a change on a branch if the same change is not merged on other branches?

18 views
Skip to first unread message

William

unread,
Feb 7, 2019, 6:50:39 PM2/7/19
to Repo and Gerrit Discussion
Hi

I have a process where when change A is merged, it propagates the change A to other branches branch B and branch C as part of change-merged hook,some of these changes change B /change C have merge conflicts and developers dont resolve those conflicts in a timely manner.

I want to enforce that  changeA will only merge if all the changes B and C have merge conflcits resolved..how can I enforce this in change-merged hook?what can i add in the change-merged hook that will block the merge of change A until the merge conflicts in changeB and change C are resolved?any ideas are appreciated?

change A --> branch A
change B --> branch B
change C --> branch C

David Pursehouse

unread,
Feb 7, 2019, 10:44:44 PM2/7/19
to William, Repo and Gerrit Discussion
Maybe not exactly what you want, but one way to do this is to enable the "submit whole topic" feature, and add the same topic to all 3 changes.  Then it will only be possible to submit all the changes at once when all are ready.
 

--
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Reply all
Reply to author
Forward
0 new messages