Why does git merge with no conflicts still produce a merge commit? -


i'm trying understand why git produce commit unique sha1 merge between 2 branches no conflicts. storing information there no conflicts worth clutter revision history?

the short answer commit records specific state of working directory, , merge create state doesn't match either of parents, new commit required, opposed moving branch pointer. elaborate bit more, though, helps understand means merge 2 branches.

the 2 common ways git merge used a) catch local branch remote branch , b) merge 2 separate branches together.

in first case, have this:

a--b--c--d--e--f--g       ^           ^       |           +-- origin/master       +-- master

in case, git merge origin/master moves pointer master new location. what's called "fast forward" merge, , not result in new commit (although can explicitly request 1 if have reason to).

on other hand, if have this:

a--b--c--d--e--f--g <-- branch1       \        j--k--l--m--n <-- branch2

and on branch2 , want merge in branch1, moving branch2 pointer not make sense. if moved branch2 point g, lose changes made in j through n. in case git merge must create new commit, resulting working tree took copy of c (the merge base of g , n, can see running git merge-base branch1 branch2), , applied of changes in d through g , in j through n. if results in no conflicts (the 2 branches either modified different sets of files or @ least different areas of files), resulting working directory state not match either g or n, new commit required. git create new commit working directory contains results of applying changes both branches, , mark commit having both g , n parents.

so, it's not "storing information there no conflicts", it's storing new unique state of project. sure, can @ commit git log, git diff, etc. , see either there or weren't conflicts, that's not reason new commit made.


Comments

Post a Comment

Popular posts from this blog

How to mention the localhost in android -

i trying call localhost in android application. unfortunately not possible used several methods emulator local host http://10.0.2.2/android/dbconnection.php and network ip address http://192.168.1.xx/android/dbconnection.php also http://localhost:8080/android/dbconnection.php but nothing connected localhost. purpose refer stackoverflow answers not working i facing same problem when worked on localhost. referred stackoverflow answer got solution create new emulator works fine in new emulator.
Read more

php - Calling a template part from a post -

i include iframe within post in wordpress. located inside content of post, meaning cannot in post template file, otherwise either before or after. i'd add facebook plugin within posts: <div id="socialwrap"><div class="fb-like" data-href="http://onlinearizonahomes.info" data-send="true" data-width="450" data-show-faces="true" data-font="arial"></div></div> i thinking of calling template part within post <?php get_template_part( 'social' ); ?> cannot use php within post without plugin (i'd avoid using plugin this). an alternative using javascript create html in post, seems unnecessary use of javascript. what best way add html within wordpress post? you can use shortcode. add functions.php function cudjex_fbshare( $atts, $content = null ) { global $post; $link = get_permalink($post->id); return '<div id="socialwrap...
Read more

c# - String.format() DateTime With Arabic culture -

check below code snippet, namespace testdateconvertion { class program { static void main(string[] args) { datetime testvalue = new datetime(2013, 12, 15, 15, 33, 44); cultureinfo culture = new cultureinfo("ar-sa"); string stringvalue = string.format(culture, "{0:d} {0:hh:mm:ss}", testvalue); console.writeline(stringvalue); console.readline(); } } } it gives output 22/02/35 15:33:44 i not getting how possible. whats 35 doing in output there that's 13/12/2015 in hijri, 35 means 1435 in hijri, default date format saudi arabia.
Read more