git - files disappearing after pushing to local branch and remote -



git - files disappearing after pushing to local branch and remote -

in git repo, have 3 branches:

master dev gh-pages

my primary thought commit info dev, gh-pages (and force remote storing or backing up). after done.. merge master.

what's interesting is.. when commit info dev, gh-pages , force them, files disappearing! (why happening?)

now, after happened, want clone repo, work on again.. there no files on master, cloning nothing.

i guess used git merge master while in either dev or gh-pages, merges from master, not to master.

you need first switch master, merge branch want merge from:

git checkout master git merge <branch>

by way, gh-pages should separate code. it's documentation of github repository, , files have nil code. don't merge content master.

git github

Comments

Post a Comment

Popular posts from this blog

javascript - mongodb won't find my schema method in nested container -

javascript - mongodb won't find my schema method in nested container - i trying access method of schema stored within mixed container. here situation : have cases model can many different things, have schema each of these things stored in "casecontent" mixed property. var caseschema = mongoose.schema({ casecontent : {}, object : {type:string, default : "null"}, collision : {type : boolean, default : false} }); the casecontent property filled model of 1 of schemas, 1 exemple : var treeschema = new mongoose.schema({ applecount : {type : number, default : 3} }); treeschema.methods.dostuff = function (data) { console.log('hey, listen'); homecoming true; }; then, want utilize method of schema original container : caseschema.methods.dostuff = function (data) { if (this.casecontent.dostuff !== undefined) { this.casecontent.dostuff(); console.log('it worked'); } else { ...
Read more

Hibernate criteria by a list of natural ids -

Hibernate criteria by a list of natural ids - i trying create hibernate criteria using list of natural ids. saw illustration here http://docs.jboss.org/hibernate/core/3.5/reference/en-us/html/querycriteria.html#query-criteria-naturalid shows illustration querying single record: session.createcriteria(user.class) .add(restrictions.naturalid() .set("name", "gavin") .set("org", "hb")); is there improve way create criteria list of natural ids illustration below? junction junction = restrictions.disjunction() .add(restrictions.naturalid() .set("name", "gavin") .set("org", "hb")) .add(restrictions.naturalid() .set("name", "jdoe") .set("org", "rh")); session.createcriteria(user.class) .add(junction); thanks. in experience, no. reason due limitations of sql in implementations. when seek phrase in sql gets...
Read more

ios - Lagging ScrollView with UIWebview inside -

ios - Lagging ScrollView with UIWebview inside - i have uiwebview within uiscrollview lot of content. when content loaded uiwebview big, starts lag. does know how solve issue? maintain in mind lags when uiwebview's height becomes considerably big. thank in advance! if read documentation on uiwebview , states not embed uiwebview uitableview or uiscrollview . doing leads unexpected behaviour, , think experiencing first hand. sorry bearer of bad news. update - specific warning apple docs: the documentation addresses issue specifically. important: should not embed uiwebview or uitableview objects in uiscrollview objects. if so, unexpected behavior can result because touch events 2 objects can mixed , wrongly handled. apple reference on uiwebview . update 2: after doing few searches (search link, same posted in comments), came across this answer, may provide insight. monitors content offset in both uiscrollview , uiwebview via delegates, , cle...
Read more