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...
Read more

python - Django-cities exits with "killed" -

i trying install django-cities on server 500mb ram. whenever run: manage.py cities the system exits saying killed. trying run: manage.py cities --import=country --force worked, guessing matter of running out of memory. to bypass, tried refer package local copy of cities' data file. still didn't work. any ideas on how can migrate data without having increase memory on server? based on suggestion comments, solved setting temporary swap file. if unfamiliar it, can follow these steps: set swap file touch /var/swap.img chmod 600 /var/swap.img set swap file size cd /var dd if=/dev/zero of=/var/swap.img bs=1024k count=1000 this create 1gb swap file. prepare disk image mkswap /var/swap.img activate swap memory swapon /var/swap.img once done, can turn off swap image: swapoff /var/swap.img more information on virtual memory , swap files can found here: https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-me...
Read more

python - How to get a widget position inside it's layout in Kivy? -

i have gridlayout , added image widgets on after adding of images want draw rectangle in each image using canvas couldn't because don't know exact image widgets positions on gridlayout. code: http://paste.ofcode.org/3bdp9yhjrcrzmsztbu9hqp4 http://paste.ofcode.org/3az3gx4fxzr9dlhe2ami97c in last line of python code : rectangle(pos = (child.x - 2.4, child.y + 467), size = (70, 70)) how draw rectangle in child(my method not good^), also why gridlayout not coming in center after setting it's pos_hint = {"center_x" : .5}? if understand question right, try use such methods to_local() , to_parent() , to_widget() , to_window() . try substract position of gridlayout widgets' positions.
Read more