git - Avoid merging issues on developers's feature branches from messing up master branch's history -


we migrated svn -> git (using stash) . after migration , have started seeing issues during merge developers messing merge on feature branch. 

**our workflow model:-**  master    1---2----3------------4----5             | |        |   |    |    |              | |        m   |    |    |   feature1    | a--------b---     |    |              |                   m    | feature2    c-----------------d-------

in above figure lets developer1 has feature branch feature1 , has done changes , merged develop.

developer2 has branch created before developer1's branch going around longer time. once changes done, pulls in changes master branch , resolves conflicts , merges in.

the problem when developer2 merges changes local branch resolving merge conflicts preferring own files. however, overriding of files has not changed . when creates pull request , merges master, rolls changes of developer1 previous version. can fire out because file rolls previous commit (sha) id

the question is,

  1. is there way can avoid systematically i.e ask git reject changes master change sha id rollback.
  2. is there way during merge when developers conflicts on files have changed

my googling brought me articles suggested doing git pull --rebase option or changing permission on master branch allow fast-forward merges. either of options helps.

welcome git. realise it's not magic, merging issues haven't disappeared, , still need merge did.

the answer ensure developers merge correctly, , no tool in world force that. it's people problem ultimately.

i recommend code reviews mandatory push requests origin, or merging master. 1 of reviews inspect history see if such overrides has occurred appropriate censures.


Comments

Post a Comment

Popular posts from this blog

javascript - Jquery show_hide, what to add in order to make the page scroll to the bottom of the hidden field once button is clicked -

i have button on website when clicked, reveals map. button can seen when page first loads up, when clicked, section holding map slides open , goes out of screen since page loads @ top (normal). want page scroll down bottom of div select when button pushed, if map out of screen. if page scrolled down, , clicks show map button, don't want page jump bottom of map. i tried figure out myself, no luck. seasoned jquery coders able give me guidance? many thanks! map = mapdiv.gmap3("get"); infobox = new infobox({ pixeloffset: new google.maps.size(-220, -310), closeboxurl: '', enableeventpropagation: true }); mapdiv.delegate('.infobox .close','click',function () { infobox.close(); }); jquery(".slidingdiv").hide(); jquery(".show_hide").show(); jquery('.show_hide').click(function(){ lastcenter=map.getcenter(); jquery(".slidingdiv&quo
Read more

javascript - Highcharts multi-color line -

Image
i looking create highchart multi-colored line. if goes down under value, become red, , when comes on value, become green . here picture example: or maybe highcharts have other charts models differentiate high or low level color? you can achieve coloring using lineargradient coloring: color: { lineargradient: { x1: 0, x2: 0, y1: 0, y2: 1 }, stops: [ [0, 'red'], [0.25, 'yellow'], [0.50, 'green'], [0.75, 'yellow'], [1, 'red'] ] } here 0 in stops relates minimum value of series , 1 maximum value, , in between percentages between values. if find percentages according values prior creating chart use correct stops values make relate specific values in data (at least approximately). see this jsfiddle example .
Read more

javascript - Enter key does not work in search box -

tried search guys sorry. input in search box doesnt work (or search) when hit enter when user clicks search button. doing wrong? here code. thanks. <script type="text/javascript"> $(document).ready(function() { $("#submit").click(function() { var url = "http://asla.org/awardssearch.html"; url += "?s=" + $('#googlecse').val(); window.location = url; }); $('#googlecse').keydown(function(event) { if (event.keycode == '13') { $("#submit").click(); } else { //do nothing :) } }); }); </script> <form class="navbar-form navbar-right" role="search"> <div class="search"> <input id="googlecse" type="text" onblur="if(this.value=='')this.value=this.defaultvalue;" onfocus="if(this.value==this.defaultvalue)t
Read more