StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>First, check <code>git status</code>.<br> As the OP mentions, </p> <blockquote> <p>The actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict.</p> </blockquote> <p>That is where <code>git status</code> would mention that file as being "<code>both modified</code>"</p> <blockquote> <p>Resolution: Commit the conflicted file.</p> </blockquote> <hr> <p>You can find a similar situation 4 days ago <em>at the time of writing this answer</em> (March 13th, 2012) with this post: "<a href="http://lleksah.wordpress.com/2012/03/13/pull-is-not-possible/" rel="nofollow noreferrer">‘Pull is not possible because you have unmerged files’</a>":</p> <pre><code>julita@yulys:~/GNOME/baobab/help/C$ git stash pop help/C/scan-remote.page: needs merge unable to refresh index </code></pre> <p>What you did was to fix the merge conflict (editing the right file, and committing it):<br> See "<a href="https://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git">How do I fix merge conflicts in Git?</a>"</p> <p>What the blog post's author did was:</p> <pre><code>julita@yulys:~/GNOME/baobab/help/C$ git reset --hard origin/mallard-documentation HEAD is now at ff2e1e2 Add more steps for optional information for scanning. </code></pre> <p>I.e aborting the current merge completely, allowing the <code>git stash pop</code> to be applied.<br> See "<a href="https://stackoverflow.com/questions/101752/aborting-a-merge-in-git">Aborting a merge in Git</a>".</p> <p>Those are your two options.</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