git - Is merging branch A into B same as merging B into A? -

-

in git repository, merging branch a b same merging b a?

no, if merge b, in end branch have a's changes, , b have both a+b changes.

if merge b a, have both a+b changes, , b have b's changes.

start:

 /a1-a2-a3 x   \b1-b2-b3

a b merge commit:

 /a1-a2-a3 x   \b1-b2-b3-a*(1,2,3)

a b fast forward:

 /a1-a2-a3 x   \a1-a2-a3-b1'-b2'-b3'

b merge commit:

 /a1-a2-a3-b*(b1,b2,b3) x   \b1-b2-b3

b fast forward:

 /b1-b2-b3-a1'-a2'-a3' x   \b1-b2-b3

Comments

Post a Comment

Popular posts from this blog

Unable to remove the www from url on https using .htaccess -

-
i want remove www site url. ie. https://www.domainname.com.au https://domainname.com.au . i have tried various .htacces code nothing work me. here present code remove www http not work https. rewriteengine on rewritebase / rewritecond %{http_host} ^www\.(.*)$ [nc] rewriterule ^/(.*)$ http://%1/$1 [r=301,l] rewritecond %{https} off rewriterule ^(.*)$ https://domainname.com.au/$1 [r=301,l] rewriterule ^code-of-conducts/(.*)/$ code-of-conducts.php?type=$1 rewriterule ^parents/post-a-job/(.*)/edit/$ parents/post-a-job.php?action=edit&id=$1 rewriterule ^parents/post-a-job/(.*)/$ parents/post-a-job.php?job_type=$1 rewriterule ^parents/open-jobs/(.*)/delete/$ parents/open-jobs.php?action=delete&id=$1 rewriterule ^parent-profile/(.*)/$ parent-profile.php?id=$1 rewriterule ^parents/job-details/(.*)$ parents/job-details.php?applied_id=$1 rewriterule ^sitterprofile/(.*)/$ sitterprofile.php?id=$1 rewriterule ^sitter/job-board/state/(.*)/page/(.*)/$ sitter/job-board.ph...
Read more