{"id":29058,"date":"2018-12-10T10:54:44","date_gmt":"2018-12-10T08:54:44","guid":{"rendered":"https:\/\/mamchenkov.net\/wordpress\/?p=29058"},"modified":"2018-12-10T10:54:52","modified_gmt":"2018-12-10T08:54:52","slug":"git-merge-vs-git-rebase","status":"publish","type":"post","link":"https:\/\/mamchenkov.net\/wordpress\/2018\/12\/10\/git-merge-vs-git-rebase\/","title":{"rendered":"git merge vs. git rebase"},"content":{"rendered":"\n\n
\"\"<\/figure>\n\n\n\n

There’s a lot of confusion between git merge<\/a> and git rebase<\/a> even among seasoned users of git.\u00a0 “An Introduction to Git Merge and Git Rebase: What They Do and When to Use Them<\/a>” is a great article explaining the pros and cons of each, and when and why using each of this is better.<\/p>\n\n\n\n

While I understand it a lot better now, I still much prefer the merge approach.\u00a0 It’s simpler and less dangerous, and maintains the full history.\u00a0 This might get noisy at times, but works as a last resort when trying to understand what was going through the developer’s head when he was working on a piece of code.<\/p>\n\n","protected":false},"excerpt":{"rendered":"\n

There’s a lot of confusion between git merge and git rebase even among seasoned users of git.\u00a0 “An Introduction to Git Merge and Git Rebase: What They Do and When to Use Them” is a great article explaining the pros and cons of each, and when and why using each of this is better. While … Continue reading git merge vs. git rebase<\/span><\/a><\/p>\n\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_feature_clip_id":0,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"git merge vs. git rebase #WebDev #git #BestPractices","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2},"jetpack_post_was_ever_published":false,"_links_to":"","_links_to_target":""},"categories":[1,18,62,1334],"tags":[3069,3179,2265,1588,1330],"keyring_services":[],"class_list":["post-29058","post","type-post","status-publish","format-standard","hentry","category-general","category-programming","category-technology","category-web-work","tag-best-practices","tag-collaboration","tag-git","tag-version-control","tag-web-development"],"aioseo_notices":[],"aioseo_head":"\n\t\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t