Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You're certainly using Dropbox to sync your project among multiple computers. While performing the sync, the tool detected a conflict between two files and created a backup with the suffix <code>(COMPUTER_NAME's conflicted copy DATE)</code>.</p> <p>Unfortunately, the conflicted file is a reference, and according to Git naming convention, the name of a reference cannot contain spaces. See <strong><a href="http://git-scm.com/docs/git-check-ref-format.html" rel="noreferrer">git check-ref-format man page</a></strong> for more information about rules describing how references should be named.</p> <p>As references are only text files containing pointers to a commit Sha or another reference, fixing this is not a complex issue.</p> <p><strong>In order to resolve this, the following steps should be followed:</strong></p> <ul> <li>Within your project directory, open both the <code>.git/refs/remotes/heroku/master</code> and the <code>.git/refs/remotes/heroku/master (Richard Burton's conflicted copy 2012-11-24)</code> files in a text editor and decide which content is the most up to date (ie. which is the real tip of the remote master branch on Heroku).</li> <li>Copy the correct SHA and paste it in the file named <code>.git/refs/remotes/heroku/master</code></li> <li>Drop the <code>.git/refs/remotes/heroku/master (Richard Burton's conflicted copy 2012-11-24)</code> file.</li> </ul> <p><strong>Note:</strong> you may have other files in conflict. In order to be thorough, launch a recursive search in your project for files which name contains <code>conflicted copy</code></p> <p><strong>Note 2:</strong> <code>git ls-remote --heads heroku</code> may be handy in this situation as it will request the remote repository about its known branchs.</p>
    singulars
    1. This table or related slice is empty.
    1. POGitHub App & Heroku — fatal: Reference has invalid format: 'refs/remotes/heroku/master'
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USnulltoken
    1. USnulltoken
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POGitHub App & Heroku — fatal: Reference has invalid format: 'refs/remotes/heroku/master'
      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. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThanks! How can I find this file and change it? Spotlight is letting me down.
      singulars
      1. PO
      1. USRichard Burton
    2. COWithin your project usually lives the `.git` folder. It is hidden. `ls -a` should list it.
      singulars
      1. PO
      1. USnulltoken
    3. COWas this answer helpful to you?
      singulars
      1. PO
      1. USnulltoken
 

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