<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 30, 2016 at 4:05 PM, Atin Mukherjee <span dir="ltr"><<a href="mailto:amukherj@redhat.com" target="_blank">amukherj@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Is it a good idea to consolidate all of the events declaration (the identified ones) in one patch and then respective patches take care of implementing them to avoid the merge conflicts we are going through? <br clear="all"></div></blockquote><div><br></div><div>I've sent a patch [1] for the same and if all the per component event patches can be made dependent of it, merge conflicts will go away.<br><br>[1] <a href="http://review.gluster.org/#/c/15351">http://review.gluster.org/#/c/15351</a><br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><span class=""><font color="#888888"><div><br><div data-smartmail="gmail_signature"><div dir="ltr"><div></div>--Atin<br></div></div>
</div></font></span></div>
</blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><br></div>--Atin<br></div></div>
</div></div>