vnys · January 3, 2018 13:43
diff --git a/index.html b/index.html
 <html><body>

 <div class="timeline-comment-wrapper js-comment-container">


        

 <div class="avatar-parent-child timeline-comment-avatar">
    <a href="/IanVS">
      <img alt="@IanVS" class="avatar rounded-1" src="https://avatars3.githubusercontent.com/u/4616705?s=88&amp;v=4" width="44" height="44">
    </a>

 </div>


      
  <div id="issuecomment-269539948" class="comment previewable-edit js-comment js-task-list-container timeline-comment  " data-body-version="ff7c3f06d8162260488fd6fa14b5efb6">

    
 <div class="timeline-comment-header clearfix">
  <div class="timeline-comment-actions">
    







 <!-- Closes div if we are showing the kebab menu -->

  </div>

    



  <h3 class="timeline-comment-header-text f5 text-normal">

    <strong>
      

  <a href="/IanVS" class="author text-inherit">IanVS</a>
  

    </strong>

    commented

    <a href="#issuecomment-269539948" class="timestamp"><relative-time datetime="2016-12-28T20:58:58Z" title="Dec 28, 2016, 9:58 PM GMT+1">on Dec 28, 2016</relative-time></a>


      
 <span class="d-inline-block text-gray-light">•</span>


 <div class="d-inline-block dropdown js-menu-container js-select-menu">
  <button class="btn-link no-underline text-gray dropdown-toggle js-menu-target" type="button" aria-expanded="false" aria-haspopup="true">
      edited
      <svg aria-hidden="true" class="octicon octicon-triangle-down v-align-middle" height="11" version="1.1" viewBox="0 0 12 16" width="8"><path fill-rule="evenodd" d="M0 5l6 6 6-6z"></path></svg>
  </button>

  <div class="dropdown-menu-content anim-scale-in js-menu-content">
    <div class="dropdown-menu dropdown-menu-se py-0 overflow-hidden" style="width:272px">
      <div class="dropdown-header px-3 py-2 border-bottom">Edited 1 time</div>
      <ul class="bg-gray-light" style="overflow-y:auto; max-height:250px">
        <li class="d-flex flex-justify-between border-bottom px-3 py-2 f6 css-truncate">
            <a href="https://github.com/IanVS" class="text-inherit no-underline">
              <img src="https://avatars0.githubusercontent.com/u/4616705?v=4" class="avatar avatar-small v-align-middle" alt="@IanVS" width="20" height="20">
              <span class="css-truncate-target v-align-middle text-bold text-gray-dark">IanVS </span>
            </a>
          <div><relative-time datetime="2016-12-28T20:59:20Z" title="Dec 28, 2016, 9:59 PM GMT+1">on Dec 28, 2016</relative-time></div>
        </li>
      </ul>
    </div>
  </div>
 </div>

  </h3>
 </div>


    <div class="edit-comment-hide">
      
 <table class="d-block">
  <tbody class="d-block">
    <tr class="d-block">
      <td class="d-block comment-body markdown-body  js-comment-body">
          <p>The approach that has worked for me so far is this:</p>
 <pre><code>git rebase origin/master
 </code></pre>
 <p>When the first conflict arises, I checkout the <code>yarn.lock</code> then re-perform the installation</p>
 <pre><code>git checkout origin/master -- yarn.lock
 yarn install
 </code></pre>
 <p>This generates a new <code>yarn.lock</code> based on the origin/master version of <code>yarn.lock</code>, but including the changes I made to my <code>package.json</code>.  Then it's just a matter of:</p>
 <pre><code>git add yarn.lock
 git rebase --continue
 </code></pre>
 <p>And I'm back in business.</p>
      </td>
    </tr>
  </tbody>
 </table>


        

 <div class="comment-reactions has-reactions js-reactions-container ">
    <!-- '"` --><!-- </textarea></xmp> --><form accept-charset="UTF-8" action="/users/yarnpkg/reactions" class="js-pick-reaction" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" value="✓" type="hidden"><input name="_method" value="put" type="hidden"><input name="authenticity_token" value="0RJUzLcbt9xHrFgLi86MIdS/PRY4lT3ksf1VHfDM+aoa9bNO24sXcSDtet8IJJjLLIysMsmX1kWUNHdtsk6qtQ==" type="hidden"></div>
      <input name="input[subjectId]" value="MDEyOklzc3VlQ29tbWVudDI2OTUzOTk0OA==" type="hidden">

      <div class="comment-reactions-options">
          <button disabled="" class="btn-link reaction-summary-item tooltipped tooltipped-se tooltipped-multiline " name="input[content]" type="submit" value="THUMBS_UP react" aria-label="AlexDWu, mporkola, ilkka, kpuputti, saeedmahani, stephenmathieson, harunsmrkovic, kossnocorp, stevemao, wzrdzl, and 109 more reacted with thumbs up emoji">
            <g-emoji alias="+1" class="emoji mr-1" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f44d.png" ios-version="6.0">👍</g-emoji>
            119
          </button>
          <button disabled="" class="btn-link reaction-summary-item tooltipped tooltipped-s tooltipped-multiline " name="input[content]" type="submit" value="HEART react" aria-label="lucasmotta, ttaghiyev, nvitha, and pegiadise reacted with heart emoji">
            <g-emoji alias="heart" class="emoji mr-1" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/2764.png" ios-version="6.0">❤️</g-emoji>
            4
          </button>
      </div>
 </form></div>

    </div>

  </div>

  </div>
        </body></html>
	<html><body>

	<div class="timeline-comment-wrapper js-comment-container">




	<div class="avatar-parent-child timeline-comment-avatar">
	<a href="/IanVS">
	<img alt="@IanVS" class="avatar rounded-1" src="https://avatars3.githubusercontent.com/u/4616705?s=88&v=4" width="44" height="44">
	</a>

	</div>



	<div id="issuecomment-269539948" class="comment previewable-edit js-comment js-task-list-container timeline-comment " data-body-version="ff7c3f06d8162260488fd6fa14b5efb6">


	<div class="timeline-comment-header clearfix">
	<div class="timeline-comment-actions">








	<!-- Closes div if we are showing the kebab menu -->

	</div>





	<h3 class="timeline-comment-header-text f5 text-normal">

	<strong>


	<a href="/IanVS" class="author text-inherit">IanVS</a>


	</strong>

	commented

	<a href="#issuecomment-269539948" class="timestamp"><relative-time datetime="2016-12-28T20:58:58Z" title="Dec 28, 2016, 9:58 PM GMT+1">on Dec 28, 2016</relative-time></a>



	<span class="d-inline-block text-gray-light">•</span>


	<div class="d-inline-block dropdown js-menu-container js-select-menu">
	<button class="btn-link no-underline text-gray dropdown-toggle js-menu-target" type="button" aria-expanded="false" aria-haspopup="true">
	edited
	<svg aria-hidden="true" class="octicon octicon-triangle-down v-align-middle" height="11" version="1.1" viewBox="0 0 12 16" width="8"><path fill-rule="evenodd" d="M0 5l6 6 6-6z"></path></svg>
	</button>

	<div class="dropdown-menu-content anim-scale-in js-menu-content">
	<div class="dropdown-menu dropdown-menu-se py-0 overflow-hidden" style="width:272px">
	<div class="dropdown-header px-3 py-2 border-bottom">Edited 1 time</div>
	<ul class="bg-gray-light" style="overflow-y:auto; max-height:250px">
	<li class="d-flex flex-justify-between border-bottom px-3 py-2 f6 css-truncate">
	<a href="https://github.com/IanVS" class="text-inherit no-underline">
	<img src="https://avatars0.githubusercontent.com/u/4616705?v=4" class="avatar avatar-small v-align-middle" alt="@IanVS" width="20" height="20">
	<span class="css-truncate-target v-align-middle text-bold text-gray-dark">IanVS </span>
	</a>
	<div><relative-time datetime="2016-12-28T20:59:20Z" title="Dec 28, 2016, 9:59 PM GMT+1">on Dec 28, 2016</relative-time></div>
	</li>
	</ul>
	</div>
	</div>
	</div>

	</h3>
	</div>


	<div class="edit-comment-hide">

	<table class="d-block">
	<tbody class="d-block">
	<tr class="d-block">
	<td class="d-block comment-body markdown-body js-comment-body">
	<p>The approach that has worked for me so far is this:</p>
	<pre><code>git rebase origin/master
	</code></pre>
	<p>When the first conflict arises, I checkout the <code>yarn.lock</code> then re-perform the installation</p>
	<pre><code>git checkout origin/master -- yarn.lock
	yarn install
	</code></pre>
	<p>This generates a new <code>yarn.lock</code> based on the origin/master version of <code>yarn.lock</code>, but including the changes I made to my <code>package.json</code>. Then it's just a matter of:</p>
	<pre><code>git add yarn.lock
	git rebase --continue
	</code></pre>
	<p>And I'm back in business.</p>
	</td>
	</tr>
	</tbody>
	</table>




	<div class="comment-reactions has-reactions js-reactions-container ">
	<!-- '"` --><!-- </textarea></xmp> --><form accept-charset="UTF-8" action="/users/yarnpkg/reactions" class="js-pick-reaction" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" value="✓" type="hidden"><input name="_method" value="put" type="hidden"><input name="authenticity_token" value="0RJUzLcbt9xHrFgLi86MIdS/PRY4lT3ksf1VHfDM+aoa9bNO24sXcSDtet8IJJjLLIysMsmX1kWUNHdtsk6qtQ==" type="hidden"></div>
	<input name="input[subjectId]" value="MDEyOklzc3VlQ29tbWVudDI2OTUzOTk0OA==" type="hidden">

	<div class="comment-reactions-options">
	<button disabled="" class="btn-link reaction-summary-item tooltipped tooltipped-se tooltipped-multiline " name="input[content]" type="submit" value="THUMBS_UP react" aria-label="AlexDWu, mporkola, ilkka, kpuputti, saeedmahani, stephenmathieson, harunsmrkovic, kossnocorp, stevemao, wzrdzl, and 109 more reacted with thumbs up emoji">
	<g-emoji alias="+1" class="emoji mr-1" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f44d.png" ios-version="6.0">👍</g-emoji>
	119
	</button>
	<button disabled="" class="btn-link reaction-summary-item tooltipped tooltipped-s tooltipped-multiline " name="input[content]" type="submit" value="HEART react" aria-label="lucasmotta, ttaghiyev, nvitha, and pegiadise reacted with heart emoji">
	<g-emoji alias="heart" class="emoji mr-1" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/2764.png" ios-version="6.0">❤️</g-emoji>
	4
	</button>
	</div>
	</form></div>

	</div>

	</div>

	</div>
	</body></html>