Databases
StackOverflow2013
Postsdbo
POGit refuses to reset/discard files
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit refuses to reset/discard files
    primarykey
    data
    text
    <p>I have a project with certain js files which I cannot update. I run OSX locally and my remote/staging server is Linux (CentOS).</p> <p>Right after cloning my project locally, i noticed I have all those files with git status <code>modified</code>. I never modified them, so I tried to <code>discard changes</code> or <code>reset</code> them, but they come up again. The change that is in the modification is deleting all lines and adding them again. </p> <p>I'm not sure why this happens or how to fix it so that my git status is clean as it needs to be.</p> <p>Here is a few lines from the git status:</p> <pre><code># modified: app/webroot/js/ckeditor/plugins/devtools/lang/el.js # modified: app/webroot/js/ckeditor/plugins/devtools/lang/fa.js # modified: app/webroot/js/ckeditor/plugins/devtools/lang/gu.js </code></pre> <p>UPDATE 1: </p> <p>I have now managed to commit the above files, but the staging server is locked because it won't pull new edits:</p> <pre><code>error: Your local changes to the following files would be overwritten by merge: app/webroot/js/ckeditor/_source/lang/ar.js app/webroot/js/ckeditor/_source/lang/bg.js app/webroot/js/ckeditor/_source/lang/bn.js app/webroot/js/ckeditor/_source/lang/cs.js ... Aborting </code></pre> <p>I can't commit/push because:</p> <pre><code>Updates were rejected because a pushed branch tip is behind its remote counterpart </code></pre> <p>I tried:</p> <pre><code>git reset --hard </code></pre> <p>and</p> <pre><code>git stash git stash drop </code></pre> <p>But they don't work, nothing happens.</p> <p>UPDATE 2:</p> <p><code>git diff</code> gives me:</p> <pre><code>The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in app/webroot/js/ckeditor/_source/lang/fa.js. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in app/webroot/js/ckeditor/_source/lang/gu.js. The file will have its original line endings in your working directory. ... </code></pre>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USAD7six
    1. USmgPePe
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit refuses to reset/discard files
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit refuses to reset/discard files
      1. USVonC
      1. VTFavorite
    3. VO
      singulars
      1. POGit refuses to reset/discard files
      1. USmgPePe
      1. VTBountyStart
    1. COIf the files are shown as modified over and again, please check if there are any differences like newline, control characters etc. between your local files and repository files.
      singulars
      1. POGit refuses to reset/discard files
      1. USShunya
    2. CONo, there aren't. It would have shown only 1 line change as opposed to all lines. Also if there were any real changes, I should be able to discard them, which it is not working in this case.
      singulars
      1. POGit refuses to reset/discard files
      1. USmgPePe
 

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