[Gluster-devel] Avoid merge conflicts for per component eventing changes

[Atin Mukherjee]

On Tue, Aug 30, 2016 at 4:05 PM, Atin Mukherjee <amukherj at redhat.com> wrote:

> 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?
>

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.

[1] http://review.gluster.org/#/c/15351


>
> --Atin
>



-- 

--Atin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160830/e67e274b/attachment.html>