github - Trying to understand git upstream branch -


i have git project. remote have master branch, @ local have master , proj-structure branch. created proj-structure branch using 'git branch -b proj-structure'. @ proj-structure branch @ local, when try git push, git suggests me use git push --set-upstream origin proj-structure. read articles, should use git push --set-upstream master proj-structure. what's difference of master , origin when set upstream? if did use above command, remote create exact branch named proj-structure, , branch have commits local branch have, right?

you mixing 2 different concepts of git here. remote , branch.

remote [default: origin]

think of remote computer or person. specifying origin tell git who send current set of changes to.

branch [default: master]

you use branches keep track of separate lines of development. example can use master keep version of software tested , stable , add more branches try out new things.

think of them making copy modify.

and keeps copies separately.

now of course boring if had work on our new developments alone.

that's why don't want keep these branches on our own computer, share of them others.

usually have 1 central server used exchange (for example github). server remote named origin. pushing syncs the branch on server changes on the branch on computer , pulling syncs computer changes on server.

now, have made change know stable, on master branch on computer. can directly push master branch on our server (origin/master).
why? because git knows origin right remote push changes on branch , knows master branch called master on remote.

now lets make cool new experiment, adds pink rabbit software. because don't know yet if boss thinks idea, i'll keep in separate version now. make new branch called pink_rabbit.

i can't type git push, because our server doesn't have copy yet. because branch newly created, there no info send to.

now type:

git push --set-upstream origin pink_rabbit

what is: tell git, origin remote 1 push branch , put changes in branch called pink_rabbit on remote. next time git have information saved in branches upstream , git push work directly.

of course have typed master here, syncing experimental version on local machine directly main copy on server. kind of defeats purpose of branching in first place.

so why have these upstream links @ all?

lets company had policy, has prefix branches on server name.

on local machine, working own branches. is:

branch -b pink_rabbit git push --set-upstream origin tim/pink_rabbit

this allow me work on pink_rabbit locally , publish server tim/pink_rabbit.

apart advanced usages, should name branches same (or @ least very, similar) named on server.


Comments

Post a Comment

Popular posts from this blog

javascript - Google App Script ContentService downloadAsFile not working -

i have web app developed using google app script htmlservice , html form, populating excel sheet in google drive using spreadsheetapp . , 1 section calling contentservice download data excel file. function doget(e) { // read excel sheet //getappfile(); // render application html template return htmlservice.createtemplatefromfile('index').evaluate() .settitle('go smart') .setsandboxmode(htmlservice.sandboxmode.iframe); } function downloaddoublequatecsvfile() { var sheetid = propertiesservice.getscriptproperties().getproperty('sheetid'); var ss = spreadsheetapp.openbyid(sheetid).getactivesheet(); //var ss = spreadsheetapp.getactivespreadsheet().getactivesheet(); var maxcolumn = ss.getlastcolumn(); var maxrow = ss.getlastrow(); var data = ss.getrange(1, 1, maxrow, maxcolumn).getvalues(); if (data.length > 1) { var csv = ""; (var row = 0; row < data.length; row++) { (var c...
Read more

javascript - Function overwritting -

is there way overwrite function or event handling in function? using addeventlistener, can have many event handlers on element want var test=document.getelementbyid("div"); test.addeventlistener("click",function(){alert("im first");},false); test.addeventlistener("click",function(){alert("im second");},false); // alerts "im first" , after "im second" but if want overwrite function/event example based on client width example this function one() { alert("first"); } function two() { alert("second"); } window.onresize = function() { var test = document.getelementbyid("div"); if (window.innerwidth > 500) { test.onclick = 1 } else { test.onclick = two; } } is possible in javascript? in case use effective little known approach. addeventlistener can accept object property handleevent event handler. in case it's easy overwr...
Read more

php - Find a regex to take part of Email -

i have following emails need extract part from: bestellnummer xxx: 1 von xxx, 1er pack ------------- anfang der nachricht ------------- foo bar baz foo bar baz // <<<<< need text here ------------- ende der nachricht ------------- ------------- anfang der nachricht ------------- foo bar baz foo bar baz ------------- ende der nachricht ------------- there 0 unlimited occurences of ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- and i'm able extract first part regex: $re = "/------------- .*? -------------.?(.*?).?------------- .*? -------------/s"; but, i'm quite new on learning regex, i'm pretty sure there must better regex extract part (foo bar baz foo bar baz) of text between ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- as can in different languages, i'm using .? to match between hyphens. i...
Read more