Databases
StackOverflow2013
Postsdbo
POGit - Merging a non-git folder with a similar folder under git
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit - Merging a non-git folder with a similar folder under git
    primarykey
    data
    text
    <p>I can't seem to find anything to help my situation &amp; was hoping someone could help me as I'm not entirely fluent with git yet but am loving it.</p> <p>We have a dev server under git control displaying our dev branch. We then have a master branch in addition to to the dev branch which has a stable version of the website. </p> <p>Then, on our production server we have our stable site but due to how things played out, it is not under git version control, we have just manually updated the files we needed. Obviously the stable master branch files look somewhat similar to the manually managed production set of files. </p> <p>We'd like to eventually get the production server under git control, displaying the master branch, just like the dev server reflects the dev branch. </p> <p>However, I'm not sure how to go about setting up the git repo on the production server and somehow merging it with the master branch. Could anyone please provide some pointers, hints or direction?</p> <p>The only thing I found online involved something along the lines of setting up another two repos (for a total of 3), one being a parent of the other two and somehow bringing them all together that way. I was hoping for a different solution (or at least a "ya, that's correct" so I don't go down some stupid rabbit hole. ( not sure if this <a href="https://stackoverflow.com/questions/2695619/merging-two-folders-using-git">Merging two folders using git</a> might be some sort of start?? but the lack of responses made it hard to see if that was the right thing to pursue )</p> <p>Thanks all.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USjstats
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit - Merging a non-git folder with a similar folder under git
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

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