Daryl<p>Wait, you mean you're supposed to resolve the merge conflicts BEFORE publishing the docs?</p><p>Huh.</p><p><a href="https://vmst.io/tags/git" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>git</span></a> <a href="https://vmst.io/tags/wtd" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>wtd</span></a> <a href="https://vmst.io/tags/writeTheDocs" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>writeTheDocs</span></a> <a href="https://vmst.io/tags/documentation" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>documentation</span></a></p>