Databases
StackOverflow2013
Postsdbo
POHow do I force git to think a file is unmerged?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow do I force git to think a file is unmerged?
    primarykey
    data
    text
    <p>I want to make changes to a file in my repo, then force git to believe the file is unmerged and show up in <code>git status</code> like so:</p> <pre><code># Unmerged paths: # (use "git reset HEAD &lt;file&gt;..." to unstage) # (use "git add &lt;file&gt;..." to mark resolution) # # both modified: lib/delayed/recipes.rb # </code></pre> <p>That's the entirety of my question. Read on for an explanation of why, since I know that's the first thing that will be asked.</p> <p>The purpose here is a bugfix for <a href="http://piston.rubyforge.org/" rel="noreferrer">Piston</a> which today leaves merge conflicts in the index where they are too easily overlooked.</p> <p>The way <code>piston update</code> works with a Git repo is:</p> <ul> <li>Clone the remote repo into a new temporary git repo</li> <li>Checkout that temp repo to the last commit we saw (saved in .piston.yml)</li> <li>Checkout our local repo (in a new branch) to the last commit where .piston.yml was updated</li> <li>Copy our local repo's files into the temp repo</li> <li>Commit all changes in the temp repo (these are our local changes as of the last time we updated this vendored project)</li> <li>Run <code>git merge master</code> in the temp repo to merge our local changes with the remote repo's changes</li> <li>IGNORE MERGE CONFLICTS(!) and copy all the files from the temp repo to our local repo</li> <li>Commit those files (in our new temp branch) to our local repo</li> <li>Checkout local repo back to our original starting point</li> <li>Merge temp branch into local repo (adds any further changes we have made)</li> </ul> <p>I expect to fix this problem by allowing the file with merge conflicts to be committed into the temp branch, but at the very end (after it runs <code>git merge --squash</code>) I want to tell git about the files that had a merge conflict in the temp repo.</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. USScottJ
    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
    1. VO
      singulars
      1. POHow do I force git to think a file is unmerged?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POHow do I force git to think a file is unmerged?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow do I force git to think a file is unmerged?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COSee "How to selectively recreate merge state?" thread on Git mailing list: http://thread.gmane.org/gmane.comp.version-control.git/135059
      singulars
      1. POHow do I force git to think a file is unmerged?
      1. USJakub Narębski
 

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