Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>See <a href="https://www.kernel.org/pub/software/scm/git/docs/git-merge.html" rel="nofollow noreferrer">man git merge</a> (<em>HOW TO RESOLVE CONFLICTS</em>):</p> <blockquote> <p>After seeing a conflict, you can do two things:</p> <ul> <li><p>Decide not to merge. The only clean-ups you need are to reset the index file to the HEAD commit to reverse 2. and to clean up working tree changes made by 2. and 3.; git-reset --hard can be used for this. </p></li> <li><p>Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and git add them to the index. Use git commit to seal the deal.</p></li> </ul> </blockquote> <p>And under <em>TRUE MERGE</em> (to see what 2. and 3. refers to):</p> <blockquote> <p>When it is not obvious how to reconcile the changes, the following happens:</p> <ol> <li><p>The HEAD pointer stays the same. </p></li> <li><p>The MERGE_HEAD ref is set to point to the other branch head. </p></li> <li><p>Paths that merged cleanly are updated both in the index file and in your working tree.</p></li> <li><p>...</p></li> </ol> </blockquote> <p>So: use <code>git reset --hard</code> if you want to remove the stash changes from your working tree, or <code>git reset</code> if you want to just clean up the index and leave the conflicts in your working tree to merge by hand.</p> <p>Under <a href="https://www.kernel.org/pub/software/scm/git/docs/git-stash.html" rel="nofollow noreferrer">man git stash</a> (<em>OPTIONS, pop</em>) you can read in addition:</p> <blockquote> <p>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 git stash drop manually afterwards.</p> </blockquote>
    singulars
    1. This table or related slice is empty.
    1. POgit stash blunder: git stash pop and ended up with merge conflicts
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USyannis
    1. UStanascius
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POgit stash blunder: git stash pop and ended up with merge conflicts
      singulars
      1. PTQuestion
    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. VTAcceptedByOriginator
    1. COIn fact, even after you drop a stash, it's still possible (albeit more difficult) to retrieve it again, because the changeset still exists in the repository. http://stackoverflow.com/search?q=git+recover+dropped+stash
      singulars
      1. PO
      1. USphils
    2. COI didn't understand the answer but ended up doing exactly what is described here by finding it out by myself... :)
      singulars
      1. PO
      1. USnalply
    3. CO@nalply: is that good or bad? You are welcome to improve my answer, where you didn't understand it in the first place ...
      singulars
      1. PO
      1. UStanascius
 

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