{"id":367,"date":"2015-06-08T20:39:26","date_gmt":"2015-06-09T00:39:26","guid":{"rendered":"http:\/\/deadpelican.com\/wordpress\/?p=367"},"modified":"2015-06-08T20:39:26","modified_gmt":"2015-06-09T00:39:26","slug":"gotta-get-git","status":"publish","type":"post","link":"https:\/\/deadpelican.com\/wordpress\/?p=367","title":{"rendered":"Gotta Get Git"},"content":{"rendered":"<p>I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted.<\/p>\n<p>Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new world of source control management we all seem to have entered into.<\/p>\n<p>In the good old days, you had version control like cvs or svn.<br \/>\nEverybody checked out, made changes and checked in, if somebody got their changes in before you, you had to merge the updates and commit again. If there was a merge conflict, it was your problem. You had to fix it before you committed.<\/p>\n<p>This spread the responsibility of doing the merging around to everybody and I guess it was unfair in that if you were slower, or committed less often, you had to do more merging. But that&#8217;s how it was, erm&#8230; still is to some people.<\/p>\n<p>In short, you checked out, you did work and you checked in. Everybody played nice, you tried not to break anything and the build ran off HEAD in the repository.<\/p>\n<p>Git is actually very cool, but I think it is overkill. Mercurial I also found out about, is a happy medium, it gives you all the cool parts of git without having gone overboard the way git does, but that&#8217;s just my goldilocks opinion.<\/p>\n<p>Git is the cool source control management system of the decade, and &#8216;github&#8217; is the new way of working.<\/p>\n<p>So this is what I noticed:<\/p>\n<p>svn\/cvs\/perforce\/etc:<br \/>\n1) check out<br \/>\n2) make changes<br \/>\n3) check in.<\/p>\n<p>git + github.<br \/>\n1) fork project<br \/>\n2) clone your copy of the project<br \/>\n3) check out from your local repository to your work directory<br \/>\n4) make changes<br \/>\n5) add changed files to list of things to commit<br \/>\n6) commit changes to your local repository (admittedly this can be done in one step, but it is actually 2 steps)<br \/>\n7) push changes from your local repository to your forked repository on github.<br \/>\n8) open a pull request to the owner\/project manager of the original project you forked, where they will then pull the changes from your forked repository to the main repository.<\/p>\n<p>I think we can safely call this &#8216;progress&#8217;.<\/p>\n<p>I think the oddest thing about this new process, is that svn used to tell you when you tried to commit that you had to update and merge changes first.<br \/>\nThe github way, github will mention that your changes will or won&#8217;t merge cleanly, but that doesn&#8217;t stop you from submitting a pull request.<br \/>\nSo the effort of not accepting your pull request becomes the problem of a human (the owner of the project who got the pull request) whereas it used to be a computer that did it.<br \/>\nI don&#8217;t know github that well, maybe it&#8217;s configurable not to allow pull requests if the merge won&#8217;t be clean, but if not, the making-the-human-part-of-the-process seems to be a step backwards.<\/p>\n<p>I realize that github now gives the project owner the flexibility of not accepting changes they don&#8217;t want, but, I dunno, where I come from, we&#8217;re all supposed to be working on the same team.<\/p>\n<p>Maybe that&#8217;s the core difference between the open source environment and the corporate environment: you can ignore the work of open sourcers, after all, you&#8217;re not paying them anyway.<\/p>\n<p>&nbsp;<\/p>\n","protected":false},"excerpt":{"rendered":"<p>I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"om_disable_all_campaigns":false,"_monsterinsights_skip_tracking":false,"footnotes":""},"categories":[1],"tags":[],"class_list":["post-367","post","type-post","status-publish","format-standard","hentry","category-notes"],"aioseo_notices":[],"aioseo_head":"\n\t\t<!-- All in One SEO 5.0.3 - aioseo.com -->\n\t<meta name=\"description\" content=\"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new\" \/>\n\t<meta name=\"robots\" content=\"max-image-preview:large\" \/>\n\t<meta name=\"author\" content=\"admin\"\/>\n\t<link rel=\"canonical\" href=\"https:\/\/deadpelican.com\/wordpress\/?p=367\" \/>\n\t\t<meta name=\"generator\" content=\"All in One SEO (AIOSEO) 5.0.3\" \/>\n\t\t<meta property=\"og:locale\" content=\"en_US\" \/>\n\t\t<meta property=\"og:site_name\" content=\"More rants of a dead man - If you like something I&#039;ve said send me a dollar on paypal nixomose@gmail.com\" \/>\n\t\t<meta property=\"og:type\" content=\"article\" \/>\n\t\t<meta property=\"og:title\" content=\"Gotta Get Git - More rants of a dead man\" \/>\n\t\t<meta property=\"og:description\" content=\"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new\" \/>\n\t\t<meta property=\"og:url\" content=\"https:\/\/deadpelican.com\/wordpress\/?p=367\" \/>\n\t\t<meta property=\"article:published_time\" content=\"2015-06-09T00:39:26+00:00\" \/>\n\t\t<meta property=\"article:modified_time\" content=\"2015-06-09T00:39:26+00:00\" \/>\n\t\t<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n\t\t<meta name=\"twitter:title\" content=\"Gotta Get Git - More rants of a dead man\" \/>\n\t\t<meta name=\"twitter:description\" content=\"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new\" \/>\n\t\t<script type=\"application\/ld+json\" class=\"aioseo-schema\">\n\t\t\t{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"BlogPosting\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#blogposting\",\"name\":\"Gotta Get Git - More rants of a dead man\",\"headline\":\"Gotta Get Git\",\"author\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?author=1#author\"},\"publisher\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#organization\"},\"datePublished\":\"2015-06-08T20:39:26-04:00\",\"dateModified\":\"2015-06-08T20:39:26-04:00\",\"inLanguage\":\"en-US\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#webpage\"},\"isPartOf\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#webpage\"},\"articleSection\":\"Notes\"},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#breadcrumblist\",\"itemListElement\":[{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#listItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?cat=1#listItem\",\"name\":\"Notes\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?cat=1#listItem\",\"position\":2,\"name\":\"Notes\",\"item\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?cat=1\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#listItem\",\"name\":\"Gotta Get Git\"},\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#listItem\",\"name\":\"Home\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#listItem\",\"position\":3,\"name\":\"Gotta Get Git\",\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?cat=1#listItem\",\"name\":\"Notes\"}}]},{\"@type\":\"Organization\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#organization\",\"name\":\"More rants of a dead man\",\"description\":\"If you like something I've said send me a dollar on paypal nixomose@gmail.com\",\"url\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/\"},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?author=1#author\",\"url\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?author=1\",\"name\":\"admin\",\"image\":{\"@type\":\"ImageObject\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#authorImage\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/4cb1f292fde35bfd91fc60f53aec5ac3f24835d6edc1bf71c6a7acb6d0348592?s=96&d=mm&r=g\",\"width\":96,\"height\":96,\"caption\":\"admin\"}},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#webpage\",\"url\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367\",\"name\":\"Gotta Get Git - More rants of a dead man\",\"description\":\"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new\",\"inLanguage\":\"en-US\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#website\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?p=367#breadcrumblist\"},\"author\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?author=1#author\"},\"creator\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/?author=1#author\"},\"datePublished\":\"2015-06-08T20:39:26-04:00\",\"dateModified\":\"2015-06-08T20:39:26-04:00\"},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#website\",\"url\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/\",\"name\":\"More rants of a dead man\",\"description\":\"If you like something I've said send me a dollar on paypal nixomose@gmail.com\",\"inLanguage\":\"en-US\",\"publisher\":{\"@id\":\"https:\\\/\\\/deadpelican.com\\\/wordpress\\\/#organization\"}}]}\n\t\t<\/script>\n\t\t<!-- All in One SEO -->\n\n","aioseo_head_json":{"title":"Gotta Get Git - More rants of a dead man","description":"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new","canonical_url":"https:\/\/deadpelican.com\/wordpress\/?p=367","robots":"max-image-preview:large","keywords":"","webmasterTools":{"miscellaneous":""},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"BlogPosting","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#blogposting","name":"Gotta Get Git - More rants of a dead man","headline":"Gotta Get Git","author":{"@id":"https:\/\/deadpelican.com\/wordpress\/?author=1#author"},"publisher":{"@id":"https:\/\/deadpelican.com\/wordpress\/#organization"},"datePublished":"2015-06-08T20:39:26-04:00","dateModified":"2015-06-08T20:39:26-04:00","inLanguage":"en-US","mainEntityOfPage":{"@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#webpage"},"isPartOf":{"@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#webpage"},"articleSection":"Notes"},{"@type":"BreadcrumbList","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#breadcrumblist","itemListElement":[{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/#listItem","position":1,"name":"Home","item":"https:\/\/deadpelican.com\/wordpress\/","nextItem":{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/?cat=1#listItem","name":"Notes"}},{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/?cat=1#listItem","position":2,"name":"Notes","item":"https:\/\/deadpelican.com\/wordpress\/?cat=1","nextItem":{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#listItem","name":"Gotta Get Git"},"previousItem":{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/#listItem","name":"Home"}},{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#listItem","position":3,"name":"Gotta Get Git","previousItem":{"@type":"ListItem","@id":"https:\/\/deadpelican.com\/wordpress\/?cat=1#listItem","name":"Notes"}}]},{"@type":"Organization","@id":"https:\/\/deadpelican.com\/wordpress\/#organization","name":"More rants of a dead man","description":"If you like something I've said send me a dollar on paypal nixomose@gmail.com","url":"https:\/\/deadpelican.com\/wordpress\/"},{"@type":"Person","@id":"https:\/\/deadpelican.com\/wordpress\/?author=1#author","url":"https:\/\/deadpelican.com\/wordpress\/?author=1","name":"admin","image":{"@type":"ImageObject","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#authorImage","url":"https:\/\/secure.gravatar.com\/avatar\/4cb1f292fde35bfd91fc60f53aec5ac3f24835d6edc1bf71c6a7acb6d0348592?s=96&d=mm&r=g","width":96,"height":96,"caption":"admin"}},{"@type":"WebPage","@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#webpage","url":"https:\/\/deadpelican.com\/wordpress\/?p=367","name":"Gotta Get Git - More rants of a dead man","description":"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new","inLanguage":"en-US","isPartOf":{"@id":"https:\/\/deadpelican.com\/wordpress\/#website"},"breadcrumb":{"@id":"https:\/\/deadpelican.com\/wordpress\/?p=367#breadcrumblist"},"author":{"@id":"https:\/\/deadpelican.com\/wordpress\/?author=1#author"},"creator":{"@id":"https:\/\/deadpelican.com\/wordpress\/?author=1#author"},"datePublished":"2015-06-08T20:39:26-04:00","dateModified":"2015-06-08T20:39:26-04:00"},{"@type":"WebSite","@id":"https:\/\/deadpelican.com\/wordpress\/#website","url":"https:\/\/deadpelican.com\/wordpress\/","name":"More rants of a dead man","description":"If you like something I've said send me a dollar on paypal nixomose@gmail.com","inLanguage":"en-US","publisher":{"@id":"https:\/\/deadpelican.com\/wordpress\/#organization"}}]},"og:locale":"en_US","og:site_name":"More rants of a dead man - If you like something I've said send me a dollar on paypal nixomose@gmail.com","og:type":"article","og:title":"Gotta Get Git - More rants of a dead man","og:description":"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new","og:url":"https:\/\/deadpelican.com\/wordpress\/?p=367","article:published_time":"2015-06-09T00:39:26+00:00","article:modified_time":"2015-06-09T00:39:26+00:00","twitter:card":"summary_large_image","twitter:title":"Gotta Get Git - More rants of a dead man","twitter:description":"I think I finally get git. I did my first rebase today and I understood what it was doing, and it did what I wanted. Feeling confident in my understanding of git, and my slight understanding of github, I feel the need to point out a funny little thing I noticed about the brave new"},"aioseo_meta_data":{"post_id":"367","title":null,"description":null,"keywords":null,"keyphrases":null,"primary_term":null,"canonical_url":null,"og_title":null,"og_description":null,"og_object_type":"default","og_image_type":"default","og_image_url":null,"og_image_width":null,"og_image_height":null,"og_image_custom_url":null,"og_image_custom_fields":null,"og_video":null,"og_custom_url":null,"og_article_section":null,"og_article_tags":null,"twitter_use_og":false,"twitter_card":"default","twitter_image_type":"default","twitter_image_url":null,"twitter_image_custom_url":null,"twitter_image_custom_fields":null,"twitter_title":null,"twitter_description":null,"schema":{"blockGraphs":[],"customGraphs":[],"default":{"data":{"Article":[],"Course":[],"Dataset":[],"FAQPage":[],"Movie":[],"Person":[],"Product":[],"ProductReview":[],"Car":[],"Recipe":[],"Service":[],"SoftwareApplication":[],"WebPage":[]},"graphName":"","isEnabled":true},"graphs":[]},"schema_type":"default","schema_type_options":null,"pillar_content":false,"robots_default":true,"robots_noindex":false,"robots_noarchive":false,"robots_nosnippet":false,"robots_nofollow":false,"robots_noimageindex":false,"robots_noodp":false,"robots_notranslate":false,"robots_max_snippet":null,"robots_max_videopreview":null,"robots_max_imagepreview":"large","priority":null,"frequency":null,"local_seo":null,"limit_modified_date":false,"created":"2023-05-11 13:47:59","updated":"2026-10-29 12:27:28","focus_keyword":null,"additional_keywords":null,"truseo_locale":null,"ai":null,"breadcrumb_settings":null,"seo_analyzer_scan_date":null},"aioseo_breadcrumb":"<div class=\"aioseo-breadcrumbs\"><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/deadpelican.com\/wordpress\/\" title=\"Home\">Home<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">\u00bb<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/deadpelican.com\/wordpress\/?cat=1\" title=\"Notes\">Notes<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">\u00bb<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\tGotta Get Git\n\t\t<\/span><\/div>","aioseo_breadcrumb_json":[{"label":"Home","link":"https:\/\/deadpelican.com\/wordpress\/"},{"label":"Notes","link":"https:\/\/deadpelican.com\/wordpress\/?cat=1"},{"label":"Gotta Get Git","link":"https:\/\/deadpelican.com\/wordpress\/?p=367"}],"_links":{"self":[{"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/367","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=367"}],"version-history":[{"count":2,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/367\/revisions"}],"predecessor-version":[{"id":370,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/367\/revisions\/370"}],"wp:attachment":[{"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=367"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=367"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/deadpelican.com\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=367"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}