title: GIT - Resolving conflicts on the same repository from two computers
body: <p>I'm in the process of merging the develop branch into a long dormant branch in order to revive it (rebase is not an option). I have over 900 conflicts in files and am trying to figure out if any of my colleagues can help. We're using windows with source tree &amp; Git kraken as we need. Is there a way to resolve conflicts in parallel from two computers working on the same repo folder? I was thinking about working on the repo on my machine resolving conflicts while a colleague opens the same repo from his computer using a windows folder share of the repo. This way (I think) we both could work resolving conflicts in parallel (I start from the top, he starts from the bottom so we don't work on the same file).</p>
  
  <p>Is this doable? Are there other ways to handle this with multiple people resolving conflicts?</p>