<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Nov 27, 2017, at 2:19 PM, Lubomir I. Ivanov <<a href="mailto:neolit123@gmail.com" class="">neolit123@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">hello,<br class=""><br class="">maybe we can think of a mechanic to avoid the release note conflicts,<br class="">as these are more common now that everyone edits the file next to a<br class="">pull request.<br class=""><br class="">Currently, if they are 2 pending pull-requests at Github and one of<br class="">them gets merged there is a good change that this will create a merge<br class="">conflict for the second PR that also touches the notes.<br class=""><br class="">i wonder if there is a way to stage / schedule a release note and<br class="">something else can merge it later that would be best.<br class=""><br class="">i was thinking about using Google docs to collaborate on a "latest<br class="">release notes changes" document, but that requires invites and someone<br class="">has to commit them manually in the end.<br class=""></div></div></blockquote></div><br class=""><div class="">Isn’t this what we are looking for:</div><div class=""><br class=""></div><div class=""><a href="http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/" class="">http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/</a></div><div class=""><br class=""></div><div class="">/D</div></body></html>