Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Suppose you have this scenario where you stash your changes in order to pull from origin. Possibly because your local changes are just <code>debug: true</code> in some settings file. Now you pull and someone has introduced a new setting there, creating a conflict.</p> <p><code>git status</code> says:</p> <pre><code># On branch master # Unmerged paths: # (use "git reset HEAD &lt;file&gt;..." to unstage) # (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution) # # both modified: src/js/globals.tpl.js no changes added to commit (use "git add" and/or "git commit -a") </code></pre> <p>Okay. I decided to go with what Git suggested: I resolved the conflict and committed:</p> <pre><code>vim src/js/globals.tpl.js # type type type … git commit -a -m WIP # (short for "work in progress") </code></pre> <p>Now my working copy is in the state I want, but I have created a commit that I don't want to have. How do I get rid of that commit without modifying my working copy? Wait, there's a popular command for that!</p> <pre><code>git reset HEAD^ </code></pre> <p>My working copy has not been changed, but the WIP commit is gone. That's exactly what I wanted! (Note that I'm not using <code>--soft</code> here, because if there are auto-merged files in your stash, they are auto-staged and thus you'd end up with these files being staged again after <code>reset</code>.)</p> <p>But there's one more thing left: The man page for <code>git stash pop</code> reminds us that <em>"Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call <code>git stash drop</code> manually afterwards."</em> So that's exactly what we do now:</p> <pre><code>git stash drop </code></pre> <p>And done.</p>
    singulars
    1. This table or related slice is empty.
    1. POHow to resolve git stash conflict without commit?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USTshepang
    1. USscy
    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. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThis also worked for a `git stash apply` for me, thank you.
      singulars
      1. PO
      1. US2rs2ts
 

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