Databases
StackOverflow2013
Postsdbo
POGit-svn rebase failing tells me update-index failed
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit-svn rebase failing tells me update-index failed
    text
    copied!<p>Super weird error, I looked around and found these similar questions, however I am not sure it's the same:</p> <p><a href="https://stackoverflow.com/questions/5367734/error-rebaseing-updating-a-git-svn-repository">Error rebaseing/updating a git-svn repository</a></p> <p><a href="https://stackoverflow.com/questions/9494341/git-svn-rebase-error">git-svn rebase error</a></p> <p><code>update-index --refresh: command returned error: 1</code></p> <p>This part of the error looks the same, however as you can see below, I don't have anything in my working directory (I ran a git status right before typing <code>git svn rebase</code>). I tried doing a <code>git reset --hard</code> and running it again with no luck.</p> <pre><code>mac-jd:IPhone jd$ git status # On branch master nothing to commit (working directory clean) mac-jd:IPhone jd$ git svn rebase branches/TechDev/MySecretProj/MySecretProj.xcodeproj/project.pbxproj: needs update update-index --refresh: command returned error: 1 mac-jd:IPhone jd$ git status # On branch master # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: branches/TechDev/MySecretProj/MySecretProj.xcodeproj/project.pbxproj # no changes added to commit (use "git add" and/or "git commit -a") </code></pre> <p>This seems like a subtle bug and any help would be greatly appreciated. Thanks a lot.</p> <p>EDIT:</p> <p><strong>FIGURED IT OUT:</strong></p> <p>I am going to leave this here for anyone else who's made this stupid, stupid, mistake. Close XCode before running the rebase -_-</p> <p>Sorry to waste the time of those helping with answers.</p> <p>I am working on a mac. The diff, when I ran it, after I tried the rebase shows me one line changed:</p> <p>Before rebase: <code>6A31D44715A5B64700AF77D8 /* libDevUtils.a */ = {isa = PBXFileReference; lastKnownFileType = file; name = libDevUtils.a; path = "Classes/Tools/SiteCodes/DevUtils/build/Release-iphoneos/libDevUtils.a"; sourceTree = "&lt;group&gt;"; };</code></p> <p>After rebase: <code>6A31D44715A5B64700AF77D8 /* libDevUtils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDevUtils.a; path = "Classes/Tools/SiteCodes/DevUtils/build/Release-iphoneos/libDevUtils.a"; sourceTree = "&lt;group&gt;"; };</code></p> <p>To help, the only thing that changed between the two lines is the lastKnownFileType which changed from 'file' to 'archive.ar'</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload