github - Deploying with multiple git repos -


for day job, work team of 6. web devs working on single project. our current git setup, running sorts of issues conflicts , things being overwritten causing havoc.

here's our current work flow. have our master branch on github repo. when push changes it, push our production server remote makes our changes "live". our bread , butter.

when have new features or bugfixes need made, create branch based off of master not include experimental or incomplete work. when branch ready testing, push branch on github call "develop".

it should noted develop (at several times in past) has been "synched" have exact same contents master.

we having problems our develop branch.we have few things on our production site not/can not function on develop. have may direct pushes master, without pushing same changes develop first. puts our master branch far ahead in commits on develop branch when merge new branch based off master develop, features pushed develop never made master because scrapped or otherwise not ready overwritten instead of throwing conflict.

trying merge , synch these 2 branches nightmare , come unpredictable results.

tl;dr i'm looking suggestions way can re-organize our git work flow things not keep happening. there features of git available not using might this? or there other solutions out there alltogether may way deploy? suggestions/tips appreciated.

you being 6 developers projects configuration management should simple.

if using github, bitbucket or equivalent can consider using "fork/pull" workflow.

even single branch workflow please ensure following

  1. do not create / push merge commits
  2. always rebase code upstream
  3. create local topic branch
  4. have correct cr/lf setting
  5. have correct indentation setting , use uniform editor (vi, emacs, eclipse etc)
  6. avoid unwanted indentation
  7. learn git

Comments

Post a Comment

Popular posts from this blog

Email notification in google apps script -

https://support.google.com/docs/answer/91588?hl=en i have sheet the cells filled in data pulled via apps script, website. pull in exact same data, not. on old sheets version use able emails when data "changes" different value. new sheets, email when new data pasted cells, though exact same data......and, can't set @ ranges anymore, entire document. there easy way watch cells when data changes, , email myself? this looks lot you're trying do. for checking whether value has changed after edit, this gives necessary information it. hence, know whether new value same 1 or not. implementing "workaround" talked in second link, able compare , send email myself if value changed. initiate onedit trigger goes off onedit function uses these lines after checks in place have passed. var email = "xyz@whatever.com"; mailapp.sendemail(email, "triggermail", "a change has occurred in sheet"); note: sends "notification...
Read more

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

javascript - IE11 incompatibility with jQuery's 'readonly'? -

the code i'm running has no issues in firefox, or chrome. user typing 1 textbox, tabs next , can continue typing that. when run webpage on ie11, user tabs next textbox , can't type in. textbox has double-clicked before user can insert anything. i've googled , seems ie give problems when using older jquery (i.e. prefers 'prop' 'attr' ). in code below jquery's readonly keyword being used in way ie11 no longer recognise/accept? i assume issue readonly , removeclass('ignore') working expected. //when focus on textbox 1 $("#field1").focus(function() { //remove readonly property textbox 1 $('#field1').prop('readonly', false).removeclass('ignore'); //add readonly property other textboxes $('#field2, #field3, #field4') .prop('readonly', 'readonly').addclass('ignore').val(''); }); i'm using jquery 2.1.3 ...
Read more