StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POI pissed in the pool GIT style - ftp'd files into repo now GIT not in sync
text
Body
copied!<h3>Ok so here's the scenario:</h3> <ul> <li>Host the code on github - push to <code>origin</code></li> <li>For deployment - push to <code>deploy</code> <em>(bare repo on bluehost that has a hook to push to www folder for all to see site)</em></li> </ul> <p>So, workflow would be like this since I work at two different locations:</p> <ul> <li>pull latest from github <em>(changes made at different location and pushed the night before)</em></li> <li>work locally and commit changes</li> <li>push to <code>origin</code> <em>(github)</em></li> <li>after everything is good need this thing online, so master is pushed to <code>deploy</code> <em>(bluehost)</em></li> </ul> <p>Still with me?</p> <p>This has worked for some time and for me it's <em>awesome</em></p> <p><strong>Then I pissed in the pool</strong></p> <p>I accidentally ftp'd files to bluehost <em>(sublime sftp was enabled)</em>, now when I try to push <code>deploy</code> the latest and greatest to bluehost I get the error that <strong>everything is up to date</strong> and if I make some changes, do a new <code>commit</code> then push, I get the error <strong>such and such file will be overwritten with merge, commit or stash ...</strong> </p> <p>The <strong>local repo and the git repo are all in check</strong>, it's the bluehost one that is messed up.</p> <p><strong>Please help me fix this.</strong> I have tried googling this and reading other posts here but everything seems to not solve my problem. I tried <code>push --force</code> but to no avail.</p> <p>Any ideas would be great. Or should I just erase the whole bluehost folder and start over with a brand new git repo to get things copacetic again?</p> <p><strong>EDIT:</strong> out put from git</p> <pre><code>C:\xampp\htdocs\www\testingboard>git status # On branch master nothing to commit, working directory clean C:\xampp\htdocs\www\testingboard>git push deploy master danferth@danferth.com's password: Everything up-to-date </code></pre> <h3>Make an edit to single file (index.php</h3> <pre><code>C:\xampp\htdocs\www\testingboard>git add -A C:\xampp\htdocs\www\testingboard>git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.php # </code></pre> <h3>Commit change to index.php</h3> <pre><code>C:\xampp\htdocs\www\testingboard>git commit -m "added mobile variable to index.p hp" [master e0be437] added mobile bariable to index.php 1 file changed, 5 insertions(+) </code></pre> <h3>push to github (works)</h3> <pre><code>C:\xampp\htdocs\www\testingboard>git push origin master Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 353 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To https://github.com/danferth/breadBoard.git 9e9f3c1..e0be437 master -> master </code></pre> <h3>push to deploy (notice the other files that were ftp'd are there as well)</h3> <pre><code>C:\xampp\htdocs\www\testingboard>git push deploy master Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 353 bytes, done. Total 3 (delta 2), reused 0 (delta 0) remote: From /home4/danferth/git/breadboard remote: 9e9f3c1..e0be437 master -> origin/master remote: error: Your local changes to the following files would be overwritten by merge: remote: .sass-cache/6329d896b0dd00f287815f75641600307d9f0023/css_didI.sc ssc remote: _START/pageTitle.php remote: assets/custom_css/css_didI.css remote: assets/custom_css/css_didI.scss remote: content/p_didI.php remote: didI.php remote: index.php remote: template.php remote: Please, commit your changes or stash them before you can merge. remote: Aborting remote: Updating 0dc9e3d..e0be437 To danferth@danferth.com:~/git/breadboard.git 9e9f3c1..e0be437 master -> master C:\xampp\htdocs\www\testingboard> </code></pre>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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