Is there any way controlling 'Automatically resolve conflicts' per branch?
Suppose there is devel and release branches, devel branch is off but release branch is on.
--
--
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.
Suppose there is devel and release branches, devel branch is off but release branch is on.Not really important for your question but wouldn't you want exactly the opposite?A release branch should be more restrictive than a development branch...so if "automatically resolve conflicts" should be off then it should be offfor a more restrictive branch.
It's so sorry that I have no way to control "automatically resolve conflicts" per branch...
On Thursday, March 13, 2014 12:48:37 AM UTC+9, zivkov wrote:Suppose there is devel and release branches, devel branch is off but release branch is on.Not really important for your question but wouldn't you want exactly the opposite?A release branch should be more restrictive than a development branch...so if "automatically resolve conflicts" should be off then it should be offfor a more restrictive branch.I agree. I thought oppositely.there can be large changes in development branch. so "automatically resolve conflicts" may break codes integrity and causes build break.But release branch has very small changes. so thought it was safe to turn on "automatically resolve conflicts".Thanks for your opinion.
--
On Thu, Mar 13, 2014 at 2:32 AM, UkJung Kim <ukjun...@gmail.com> wrote:
It's so sorry that I have no way to control "automatically resolve conflicts" per branch...I think the submit_type could be extended to include this flag also.Will try to implement that today or tomorrow...stay tuned
On Thursday, March 13, 2014 7:38:31 PM UTC+9, zivkov wrote:On Thu, Mar 13, 2014 at 2:32 AM, UkJung Kim <ukjun...@gmail.com> wrote:
It's so sorry that I have no way to control "automatically resolve conflicts" per branch...I think the submit_type could be extended to include this flag also.Will try to implement that today or tomorrow...stay tunedThat sounds good to me.