Databases
StackOverflow2013
Postsdbo
POgit deployment: untracked working tree files overwritten by merge
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit deployment: untracked working tree files overwritten by merge
    text
    copied!<p>I'm trying to implement a git based deploy procedure like in <a href="http://danbarber.me/using-git-for-deployment/" rel="nofollow">http://danbarber.me/using-git-for-deployment/</a> to deploy a web application. Basically it consists of two repos on the live server: </p> <ul> <li>a bare repo, in which you push, the "hub"</li> <li>a normal repo in the web server public directory, in which you pull from the "hub". This is performed automatically if the hub has an appropriate post-update hook.</li> </ul> <p>The problem is that in my projects I have many directories, like /upload/, which contain sample data during development and real live data on the webserver.</p> <p>Ideally I would like to keep the upload/ folder on local repo, but not pulling it on the live repo. Now, "partial" pull it doesn't seem possible, isnt'it?</p> <p>So, even if not an optimal solution (I can't clone sample data in local repos), I'm trying to ignore those folder, but: </p> <ul> <li>I added the upload/ folder to .gitignore on local and live repos.</li> <li>I removed it with git rm --cached upload/</li> <li>I pushed the project to the bare "hub" repo</li> <li>in the live repo I pull from the hub</li> <li>I get the error: untracked working tree files would be overwritten by merge...upload/xxx</li> </ul> <p>It seems to me that the upload/ folder is still somewhere... Indeed, while writing this, I see that cloning from the hub, the folder upload/ is cloned too!</p> <p>The only solution would be then, to remove completely the folder from all the project history, like I've seen in several questions?</p> <p>Is this going to force all the others colleagues working on different branches to some messy rebase?</p> <p>It's probably difficult to explain all this and to grasp it, but any idea is welcome.</p>
 

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