Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Ironically, while git’s default behavior is to treat untracked files as precious, adding the file to <code>.gitignore</code> tells git that it can trash the file whenever it wants.</p> <p>Entries in <code>.gitignore</code> are more commonly used to indicate generated files, and as such git will overwrite them silently. Entries in <code>.git/info/exclude</code> are perhaps supposed to be used for local versions of configuration files.</p> <p>Please read <a href="http://comments.gmane.org/gmane.comp.version-control.git/153700" rel="nofollow" title="git merge, .gitignore, and silently overwriting untracked files">this discussion</a> in its entirety, as there seems to be some confusion as to the difference between the two. I just tried this out, and entries in <code>.git/info/exclude</code> are protected when you go back in time, producing "error: Untracked working tree file '.rvmrc' would be overwritten by merge." This different behavior between the two might not be deliberate, according to Junio C Hamano. However, if you can remove the entry from <code>.gitignore</code> and move it to <code>.git/info/exclude</code>, you might be able to make this work, realizing that the latter is not versioned or shared between repositories and would require manual cooperation with your colleague.</p> <p>As for the permissions issue, see this:</p> <pre><code>$ touch foo $ ls -l foo -rw-r--r-- 1 josh staff 0 Oct 1 09:55 foo $ sudo chown root:wheel foo $ ls -l foo -rw-r--r-- 1 root wheel 0 Oct 1 09:55 foo $ unlink foo $ ls -l foo ls: foo: No such file or directory </code></pre> <p>In Unix, the ability to create or remove a file is based only on the permissions of the <em>directory</em> that contains it. Permissions on the file itself are only for modifications to the file (unfortunately in your case). The <code>rm</code> utility checks permissions on the file as a courtesy, but <code>unlink</code> is lower-level and blindly calls the system call.</p>
    singulars
    1. This table or related slice is empty.
    1. POprevent git checkout from overwriting a file
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USJosh Lee
    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
    1. COThank you for the very comprehensive and detailed answer. However, unfortunately I just get the message "error: Untracked working tree file '.rvmrc' would be overwritten by merge." and I can't checkout the old commit.
      singulars
      1. PO
      1. UStjmcewan
    2. CO@Tim Oh, that is a problem. The only thing I can think of is using a [filter](http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_tt_filter_tt) to modify the file after checkout, or using [filter-branch](http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html) to rewrite history to get rid of it.
      singulars
      1. PO
      1. USJosh Lee
 

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