Databases
StackOverflow2013
Postsdbo
POHow do I go about solving this git conflict?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow do I go about solving this git conflict?
    primarykey
    data
    text
    <ol> <li>I have made a central bare shared repo at foo.org.</li> <li>user A has done <code>git clone ssh://foo.org/blah.git</code></li> <li>user A has created file 'lol' which is a blank file. Commits it to local repo. Does <code>git push</code></li> <li>user B does <code>mkdir foo</code> and <code>cd foo</code></li> <li>user B then does <code>git clone ssh://foo.org/blah.git</code>. </li> <li>user B edits <code>lol</code> file.</li> <li>user A edits <code>lol</code> file.</li> <li>user A commits and <code>git push</code> to central repo</li> <li><p>user B commits and <code>git push</code> and is given:</p> <blockquote> <p>error: failed to push some refs to 'ssh://foo.org/blah.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast forward'</p> </blockquote></li> <li><p>user b does <code>git pull</code> </p> <blockquote> <p>From ssh://foo.org/home/meder/central/foo 08a0cda..fba6968 master -> origin/master Auto-merging lol CONFLICT (content): Merge conflict in lol Automatic merge failed; fix conflicts and then commit the result.</p> </blockquote></li> <li><p>user b does <code>vim lol</code> and edits file to his liking. then tries <code>git commit</code> afterwards and is given:</p> <blockquote> <p>lol: needs merge lol: unmerged (039727ec5a50d0ed45ff67e6f4c9b953bd23c17d) lol: unmerged (9307e337aa159ed6574eb84532f107685e46a16c) lol: unmerged (f88ad411f67850938dc369426cdbba76812e9126) error: Error building trees</p> </blockquote></li> </ol> <p>What do I have to do at this point? I tried a <code>git merge</code> but it says <code>fatal: You have not concluded your merge. (MERGE_HEAD exists)</code></p> <p>I know for sure I'm doing something stupidly wrong. Can someone just point out what it is?</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. USmeder omuraliev
    plurals
    1. PL
      singulars
      1. LTLinked
    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 go about solving this git conflict?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POHow do I go about solving this git conflict?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow do I go about solving this git conflict?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COpossible duplicate of [How Do I Fix Merge Conflicts in Git?](http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git)
      singulars
      1. POHow do I go about solving this git conflict?
      1. USbzlm
 

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