<div class="chatlog__message-group">
  <div id="chatlog__message-container-880302095012626432" class="chatlog__message-container" data-message-id="880302095012626432">
    <div class="chatlog__message">
      <div class="chatlog__message-aside"><img class="chatlog__avatar" src="https://cdn.discordapp.com/avatars/310258733890535426/8fffd5befbc057dcd546b39b0259e66a.png?size=512" alt="Avatar" loading="lazy"></div>
      <div class="chatlog__message-primary">
        <div class="chatlog__header"><span class="chatlog__author" title="iceman5499" data-user-id="310258733890535426">Iceman</span> <a href="/channels/304938882288582657?category=開発環境, ライブラリ&amp;channel=xcode&amp;message_id=880303075791884328"><span class="chatlog__timestamp" title="Thursday, August 26, 2021 4:06 AM"></span></a><a href="#chatlog__message-container-880302095012626432">8/26/2021 4:06 AM</a></div>
        <div class="chatlog__content chatlog__markdown"><span class="chatlog__markdown-preserve">pullしてきたコミットがPackage.resolvedを編集してたとき、Xcodeが勝手にその内容を自分が持ってる状態のPackage.resolvedに上書きしてしまって編集合戦が起こってしまうのですが、何かいい対策ってありますか？</span></div>
      </div>
    </div>
  </div>
  <div id="chatlog__message-container-880303075791884328" class="chatlog__message-container" data-message-id="880303075791884328">
    <div class="chatlog__message">
      <div class="chatlog__message-aside">
        <div class="chatlog__short-timestamp" title="Thursday, August 26, 2021 4:10 AM">4:10 AM</div>
      </div>
      <div class="chatlog__message-primary">
        <div class="chatlog__content chatlog__markdown"><span class="chatlog__markdown-preserve">今の所Xcodeから <code class="chatlog__markdown-pre chatlog__markdown-pre--inline">Update to Latest Package Versions</code> して直してますが、これ結果が偶然一致しないと直らないからいつか困りそうだなと</span></div>
      </div>
    </div>
  </div>
</div>