Databases
StackOverflow2013
Postsdbo
POgit rebase, "would be overwritten", and "No changes - did you forget to use 'git add'?"
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit rebase, "would be overwritten", and "No changes - did you forget to use 'git add'?"
    primarykey
    data
    text
    <p><code>git rebase</code> does not appear to work properly in certain cases where a file is added to the repository, then removed from the repository, then added to the working directory (but not the repository).</p> <p>Here's a more specific description of my problem:</p> <ul> <li><p>if a branch is created and switched to from some trunk,</p></li> <li><p>and a file X is added and committed in the branch,</p></li> <li><p>and subsequently X is removed and committed in the branch,</p></li> <li><p>and X is again created in the working directory, but not added or committed,</p></li> <li><p>and the trunk branch advances,</p></li> <li><p>then</p></li> <li><p>a rebase performed using the advanced trunk as the base will fail because it will refuse to overwrite X,</p></li> <li><p>and the rebase cannot be continued even if the working directory X is removed or moved out of the way.</p></li> </ul> <p>Here's a script to reproduce my problem on the command line:</p> <pre><code>git init echo foo &gt; foo.txt git add . git commit -m 'foo' echo foo &gt;&gt; foo.txt git add . git commit -m 'foo foo' git checkout -b topic HEAD^ git log echo bar &gt; bar.txt echo baz &gt; baz.txt git add . git commit -m 'bar baz' git rm bar.txt git commit -m '-bar' echo bar &gt; bar.txt git rebase master # the following output is emitted: # First, rewinding head to replay your work on top of it... # Applying: bar baz # Using index info to reconstruct a base tree... # Falling back to patching base and 3-way merge... # error: Untracked working tree file 'bar.txt' would be overwritten by merge. Aborting # Failed to merge in the changes. # Patch failed at 0001 bar baz # # When you have resolved this problem run "git rebase --continue". rm bar.txt git rebase --continue # the following output is emitted: # Applying: bar baz # No changes - did you forget to use 'git add'? # # When you have resolved this problem run "git rebase --continue". # If you would prefer to skip this patch, instead run "git rebase --skip". # To restore the original branch and stop rebasing run "git rebase --abort". </code></pre> <p>I know I can abort the rebase using <code>git rebase --abort</code>, remove <code>bar.txt</code>, and then <code>git rebase master</code> again. But how can I continue the rebase without aborting it first?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USRussell Silva
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POgit rebase, "would be overwritten", and "No changes - did you forget to use 'git add'?"
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POgit rebase, "would be overwritten", and "No changes - did you forget to use 'git add'?"
      1. USVonC
      1. VTFavorite
    3. VO
      singulars
      1. POgit rebase, "would be overwritten", and "No changes - did you forget to use 'git add'?"
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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