<html><head></head><body>You can certainly merge yourself. I would ask the following:<br>
<br>
1. Always work on your own branch.<br>
2. Before merging, pull the dev branch<br>
3. After pulling dev, rebase your branch on top of dev<br>
4. Merge your branch into dev<br>
<br>
This way, if someone makes commits while you're working, you'll avoid making merge commits.<br>
<br>
-m<br><br><div class="gmail_quote">On April 13, 2017 5:38:09 AM PDT, Dmitri Popov <lazylegs@gmail.com> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">Yes, I wouldn't dare touching anything beyond the content. :-)<br /><br />@Mica What do you say?<br /><br />Best,<br />Dmitri<br /><br />On Thu, Apr 13, 2017 at 2:34 PM, Pat David <patdavid@gmail.com> wrote:<br /><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> I don't mind myself! But I'll defer to Mica since there's still work going<br /> on for some things. I don't think there's a problem as you're generally<br /> working on content.<br /> On Thu, Apr 13, 2017 at 2:23 AM Dmitri Popov <lazylegs@gmail.com> wrote:<br /><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;"><br /> Thanks, Pat!<br /><br /> I can actually merge stuff myself if you are comfortable with me doing<br /> that. :-)<br /><br /> Best,<br /> Dmitri<br /><br /> On Wed, Apr 12, 2017 at 7:21 PM, Pat David <patdavid@gmail.com> wrote:<br /><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #8ae234; padding-left: 1ex;"> Merged!<br /><br /> On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <lazylegs@gmail.com> wrote:<br /><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #fcaf3e; padding-left: 1ex;"><br /> ... and ready for merge.<br /><br /> Best,<br /> Dmitri<br /></blockquote><br /> --<br /> <a href="https://patdavid.net">https://patdavid.net</a><br /> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC<br /></blockquote></blockquote><br /> --<br /> <a href="https://patdavid.net">https://patdavid.net</a><br /> GPG: 66D1 7CA6 8088 4874 946D 18BD 67C7 6219 89E9 57AC<br /></blockquote></pre></blockquote></div></body></html>