{"id":21719,"date":"2020-09-25T08:42:19","date_gmt":"2020-09-25T08:42:19","guid":{"rendered":"https:\/\/merikebi.warrenmyers.com\/?p=21719"},"modified":"2020-09-25T08:42:19","modified_gmt":"2020-09-25T08:42:19","slug":"is-there-a-way-to-convert-the-rebase-into-a-merge-without-having-to-go-back-and-deal-with-all-those-merge-conflicts-again-https-t-co-2dqsfwkpam-git-merge-rebase-gitmerge-gitr","status":"publish","type":"post","link":"https:\/\/merikebi.warrenmyers.com\/?p=21719","title":{"rendered":"\u201cIs there a way to convert the rebase into a merge without having to go back and deal with all those merge conflicts again?\u201d https:\/\/t.co\/2DqSFwkpAm #git #merge #rebase #gitmerge #gitrebase #sourcecontrol https:\/\/t.co\/JE13ulrT6y"},"content":{"rendered":"<blockquote class=\"twitter-tweet\">\n<p lang=\"en\" dir=\"ltr\">\u201cIs there a way to convert the rebase into a merge without having to go back and deal with all those merge conflicts again?\u201d <a href=\"https:\/\/t.co\/2DqSFwkpAm\">https:\/\/t.co\/2DqSFwkpAm<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/git?src=hash&amp;ref_src=twsrc%5Etfw\">#git<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/merge?src=hash&amp;ref_src=twsrc%5Etfw\">#merge<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/rebase?src=hash&amp;ref_src=twsrc%5Etfw\">#rebase<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/gitmerge?src=hash&amp;ref_src=twsrc%5Etfw\">#gitmerge<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/gitrebase?src=hash&amp;ref_src=twsrc%5Etfw\">#gitrebase<\/a> <a href=\"https:\/\/twitter.com\/hashtag\/sourcecontrol?src=hash&amp;ref_src=twsrc%5Etfw\">#sourcecontrol<\/a> <a href=\"https:\/\/t.co\/JE13ulrT6y\">pic.twitter.com\/JE13ulrT6y<\/a><\/p>\n<p>&mdash; Warren Myers ?? (@warrenmyers) <a href=\"https:\/\/twitter.com\/warrenmyers\/status\/1309402513695801345?ref_src=twsrc%5Etfw\">September 25, 2020<\/a><\/p><\/blockquote>\n<p><script async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"><\/script><br \/>\n<br \/>\nfrom Twitter https:\/\/twitter.com\/warrenmyers<\/p>\n<p>September 25, 2020 at 04:01AM<br \/>\nvia <a href=\"https:\/\/ifttt.com\/?ref=da&#038;site=wordpress\">IFTTT<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u201cIs there a way to convert the rebase into a merge without having to go back and deal with all those merge conflicts again?\u201d https:\/\/t.co\/2DqSFwkpAm #git #merge #rebase #gitmerge #gitrebase #sourcecontrol pic.twitter.com\/JE13ulrT6y &mdash; Warren Myers ?? (@warrenmyers) September 25, 2020 from Twitter https:\/\/twitter.com\/warrenmyers September 25, 2020 at 04:01AM via IFTTT<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_hide_featured_image":false,"_jetpack_featured_image_duplicate_dismissed":0,"_jetpack_feature_clip_id":0,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_post_was_ever_published":false},"categories":[4],"tags":[792],"keyring_services":[],"class_list":["post-21719","post","type-post","status-publish","format-standard","hentry","category-blih","tag-twitter"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/posts\/21719","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=21719"}],"version-history":[{"count":1,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/posts\/21719\/revisions"}],"predecessor-version":[{"id":21720,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=\/wp\/v2\/posts\/21719\/revisions\/21720"}],"wp:attachment":[{"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=21719"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=21719"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=21719"},{"taxonomy":"keyring_services","embeddable":true,"href":"https:\/\/merikebi.warrenmyers.com\/index.php?rest_route=%2Fwp%2Fv2%2Fkeyring_services&post=21719"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}