<ul dir="auto">
<li>VSCode Version: 1.0.1-insider (<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/microsoft/vscode/commit/85f337ee0851a464d5459ce9a354d05f94f0b9a4/hovercard" href="https://github.com/microsoft/vscode/commit/85f337ee0851a464d5459ce9a354d05f94f0b9a4"><tt>85f337e</tt></a>)</li>
<li>OS Version: OS X 10.11.4 (15E65)</li>
</ul>
<p dir="auto">Steps to Reproduce:</p>
<ol dir="auto">
<li>Have code open with git enabled on a repository (in particular, I'm working with @mozilla/gecko-dev)</li>
<li>Do a <code class="notranslate">git rebase -i</code> that will take a while (my case had 11 commits that I was squashing into 1)</li>
</ol>
<p dir="auto">A few times during the rebase, my rebase stopped because it couldn't create index.lock, saying it already existed. If I then did <code class="notranslate">git rebase --continue</code> things would carry on. (FTR, git also totally messed up the squashing in this case, but that's a git bug, not a code bug.) I realized that code's git integration was interfering with my rebase, quit code, <code class="notranslate">git reset --hard</code> to the original commit, and redid my rebase, and everything worked fine. My best guess is that the periodic <code class="notranslate">git status</code> (or similar) that code does was racing with the various commits of <code class="notranslate">git rebase</code>, and when code won, it would mess up the rebase. Code should probably avoid updating its internal knowledge of the working directory status while a rebase (or similar) is running. (Not sure if that's entirely possible, but it's at least something to think about.)</p>
<p dir="auto">Several times now I've had mysteriously deleted files when doing a git pull in a console while Visual Studio Code is running. I've seen this roughly since version 0.10.</p>
<p dir="auto">It seems that when auto-merging, Git is able to delete a file but not able to write the merged file back if it's open in Code. However that is just a hypothesis.</p>
<p dir="auto">Seen the issue last with git version 1.9.5.msysgit.1 and Code 0.10.2.</p>