github - Why does the the same conflict reappear when I use git rebase? -


i have read relevant questions git merge , git rebase on so, still cannot understand happening under hood.

here our branching situation:

master------------------------         \        \          \        \----feature b---           \                        \            \-----feature a----------\---feature a+b

we have 2 feature branches stem master @ different time, want combine 2 branches. want follow first rebase merge practice, when rebase feature feature b, conflicts. that's expected, because both features (and master) have changes in same areas. strange thing same conflict keep reappearing after git rebase --continue. drives crazy, end aborting rebase, , use git merge. turns out conflicts easy resolve.

my question two-fold:

  1. is git rebase suitable our situtation? or rebase pulling in few (1 or 2) changes?
  2. what happening under hood causes same conflict reappear again , again? understanding rebase resolve conflicts 1 @ time, comparing commit what?

relavant posts on so:

is rebase suitable situation?

based on fact feature a , feature b seem shared branches, i'd no.

rebasing way merge branches without having merge commits (i.e. commits have 2 or more parents) making appear linear history. it's best used merge local branches, branches exist in local repository , haven't been published other people. why? because of @ least 2 reasons:

  1. rebasing changes commit ids (i.e. sha-1 hashes of metadata). means once push rebased commits shared branch, appear new commits fetches them on local repo, if still contain same changes. now, if has added new commits on top of old ones in meantime, have move them. creates unnecessary confusion.

  2. when merge public branches want have merge commits in order able track how commits moved across branches. information lost rebasing.

what's happening under hood?

just regular merge. difference git rebase merges one commit @ time on top of previous 1 starting common parent. git merge merges 2 commits – entire set of changes – single operation, have resolve conflicts once.

update: resolving recurring conflicts

as @jubobs pointed out in comments, git have automated solution resolving conflicts occur multiple times: git rerere, or "reuse recorded resolution".

after enable rerere in configuration file (rerere.enabled true) every time merge conflict occurs, git record state of conflicting files before , after merge them. next time same conflict occurs – conflict involving exact same lines on both sides of merge – git automatically apply same resolution had recorded previously. let know in merge output:

conflict (content): merge conflict in 'somefile'
resolved 'somefile' using previous resolution.

here can find more details on how deal conflicts using git rerere.


Comments

Post a Comment

Popular posts from this blog

javascript - Using jquery append to add option values into a select element not working -

i'm looking dynamically populate select element names of items stored array. for reason it's not working , i'm not sure why. html: <div class="col-md-4 col-md-offset-4"> <select class="select1"> </select> , <select class="select2"> </select> </div> note i'm using bootstrap layout. here's jquery i'm using try , populate ".select1" jquery: select: function() { $.each(state.greens, function(index, value) { $(".select1").append("<option value =' " + index + " '>" + state.greens[index].name + "</option>"); }); } note function 'select' stored within object called 'display'. state.greens name of array i'm trying access. so @ end of html page call display.select(); call function. no error messages showing in console. also, saw question: appending
Read more

Android soft keyboard reverts to default keyboard on orientation change -

i'm building android soft keyboard , can't seem fix bug - have arabic , qwerty keyboard , when rotate device on qwerty keyboard (or arabic shift), it's if program has "restarted" , becomes arabic keyboard without shift. the onsaveinstancestate(bundle savedinstancestate) not work because application not extend activity inputmethodservice . i put following in android manifest android:configchanges="keyboard|keyboardhidden|orientation" android:windowsoftinputmode="stateunchanged|adjustresize"> i tried using @override public void onconfigurationchanged(configuration newconfig) { super.onconfigurationchanged(newconfig); log.i(mydebug, "config changed " + currentkeyboard.equals(qwerty)); } however, currentkeyboard.equals(qwerty)) results false , made sure true before orientation change. any appreciated. i think applications fault. if application restarting on orientation change
Read more

Rendering JButton to get the JCheckBox behavior in a JTable by using images does not update my table -

i rendering jbutton image on simulate jcheckbox behavior. why don't let jtable render jcheckbox? because need bigger checkboxes , there's no way can resize them (as far know). so, have own table cell renderer , editor. both renders jbutton , checkbox images on them. trying change image checked image unchecked image (or vice versa) , update cell value (boolean true or false). however, reason, getcelleditorvalue() not update table. so, release mouse, value goes original one. any appreciated! lot! public class tableexample extends jframe { jscrollpane pane; jpanel panel; jtable table; object[][] data; mytablemodel tm; renderer buttoncolumn; public tableexample(object[][] data) throws ioexception { string[] columns = {"column#1", "column#2", "column#3", "column#4", "column#5", "column#6"}; this.data = data; this.setpreferredsize(new dimension(700, 500));
Read more