merge - Git - Merging a non-git folder with a similar folder under git -


i can't seem find situation & hoping me i'm not entirely fluent git yet loving it.

we have dev server under git control displaying our dev branch. have master branch in addition to dev branch has stable version of website.

then, on our production server have our stable site due how things played out, not under git version control, have manually updated files needed. stable master branch files similar manually managed production set of files.

we'd production server under git control, displaying master branch, dev server reflects dev branch.

however, i'm not sure how go setting git repo on production server , somehow merging master branch. please provide pointers, hints or direction?

the thing found online involved along lines of setting 2 repos (for total of 3), 1 being parent of other 2 , somehow bringing them way. hoping different solution (or @ least "ya, that's correct" don't go down stupid rabbit hole. ( not sure if merging 2 folders using git might sort of start?? lack of responses made hard see if right thing pursue )

thanks all.

if got correctly site on production server based on master branch (or other commit in git repo) not same, i.e. manual changes in , don't want loose manual changes. if case, here in cases this:

  1. check out or clone master branch (or commit production servers data based on) somewhere.
  2. you have clean working copy production servers "base".
  3. copy data production server clean working copy.
  4. use git diff examine changes , commit relevant ones.
  5. if base checked out in step 1 not master, can merge manual changes using git merge master master.

i hope understood correctly , helps getting in right direction…


Comments

Post a Comment

Popular posts from this blog

jquery - Invalid Assignment Left-Hand Side -

i trying assign class tag via jquery, resulting in error through firebug says "invalid assignment left-hand side" on fourth line below. <cfoutput> $('.pngfix a').each(function(index) { var hreflink = $(this).attr("href"); if (hreflink.tolowercase() = '../audio.cfm') { $(this).addclass('audioimg'); } }); </cfoutput> looking around online, looks syntax problem, don't seem see it... any tips? thanks if (hreflink.tolowercase() = '../audio.cfm') that attempts assign value, rather check equality. change = operator == .
Read more

java - Play! framework 2.0: How to display multiple image? -

i need display gallery of photos. here template: @(photos: list[photo]) @title = { <bold>gallery</bold> } @main(title,"photo"){ <ul class="thumbnails"> @for(photo <- photos) { <li class="span3"> <a href="#" class="thumbnail"> <img src="@photo.path" alt=""> </a> </li> } </ul> } and here controller method: public static result getphotos() { return ok(views.html.photo.gallery.render(photo.get())); } and here photo bean : @entity public class photo extends model { @id public long id; @required public string label; public string path; public photo(string path, string label) { this.path = path; this.label = label; } private static finder<long, photo> find = new finder<long, photo>( long.class, photo.class); public static list<phot...
Read more

gmail - Is there any documentation for read-only access to the Google Contacts API? -

i want read-only access user's google contacts. there stackoverflow member wanted this, , received following answer : yes, there is, use https://www.googleapis.com/auth/contacts.readonly scope , "view contacts". this exchange reference read-only access google contacts can find using google. simply using access token obtained attempt read usual google contacts api (i.e. https://www.google.com/m8/feeds ) fails insufficient permissions. similarly, using google contacts api on new target fails 404 errors (for example https://www.googleapis.com/auth/contacts.readonly/default/full ). is there documentation anywhere on how use api, or permissible way access google contacts api full read-write access?
Read more