{
    "componentChunkName": "component---src-templates-module-js",
    "path": "/courses/devops/scm/",
    "result": {"data":{"module":{"frontmatter":{"duration":"3 hours","slug":"/courses/devops/scm/","title":"Source Control Management (SCM)"},"course":{"frontmatter":{"title":"DevOps","slug":"/courses/devops/"}},"slides":[{"frontmatter":{"slug":"/courses/devops/scm/slides/0/","title":"Why SCM?"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/1/","title":"History"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/2/","title":"What do you manage?"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/3/","title":"SCM types"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/4/","title":"Git: concepts"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/5/","title":"Git: branches"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/6/","title":"Git: tags"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/7/","title":"Git: merge & conflicts"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/8/","title":"Git: merge vs rebase"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/9/","title":"OpenSource Project Management"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/10/","title":"Project management with GitLab"}},{"frontmatter":{"slug":"/courses/devops/scm/slides/11/","title":"Git flow strategies"}}],"parent":{"body":"var _excluded = [\"components\"];\n\nfunction _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }\n\nfunction _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }\n\nfunction _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }\n\n/* @jsxRuntime classic */\n\n/* @jsx mdx */\nvar _frontmatter = {\n  \"duration\": \"3 hours\"\n};\nvar layoutProps = {\n  _frontmatter: _frontmatter\n};\nvar MDXLayout = \"wrapper\";\nreturn function MDXContent(_ref) {\n  var components = _ref.components,\n      props = _objectWithoutProperties(_ref, _excluded);\n\n  return mdx(MDXLayout, _extends({}, layoutProps, props, {\n    components: components,\n    mdxType: \"MDXLayout\"\n  }), mdx(\"p\", null, \"Source control management (or an interchangeable term \\\"version control\\\") has made a surge of collaborative work and software delivery increasingly rapid. It is now standard in software development to maintain a single source of truth for development teams, which allows multiple developers to work on the same codebase. Git, as a leader outclassing other SCM tools, is obligatory to be mastered for everyone involved in software development processes.\"), mdx(\"p\", null, \"Source control management (SCM) refers to tools that help you keep track of your code with a complete history of changes.\"), mdx(\"h2\", null, \"Why SCM?\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"How to share the work?\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"How to keep track of changes and their authors?\")), mdx(\"h2\", null, \"History\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"The concept started with engineering\", mdx(\"br\", {\n    parentName: \"li\"\n  }), mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"Drawing and project offices evolved a robust system for dealing with engineering processes and thus were born the fledgling change control and release systems.\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Modern implementation in software development since ~1980\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Git started in 2005\")), mdx(\"h2\", null, \"What do you manage?\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Code, or any \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"text-based\"), \" projects (like all the configurations needed for the project)\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Manage project versions\", mdx(\"ul\", {\n    parentName: \"li\"\n  }, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Global project version (tags)\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Each modification is a \\xABversion\\xBB\"))), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Change requests\")), mdx(\"h2\", null, \"SCM types\"), mdx(\"h3\", null, \"Centralized\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"has a single central repository\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"single point of failure\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"requires a network to inspect a history\")), mdx(\"p\", null, mdx(\"strong\", {\n    parentName: \"p\"\n  }, \"Examples:\"), \" Tortoise SVN\"), mdx(\"h3\", null, \"Distributed\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"local repository with full history\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"independent work\")), mdx(\"p\", null, mdx(\"strong\", {\n    parentName: \"p\"\n  }, \"Examples:\"), \" Git, Mercurial SCM\"), mdx(\"h2\", null, \"Git: concepts\"), mdx(\"p\", null, \"Learn git - \", mdx(\"a\", {\n    parentName: \"p\",\n    \"href\": \"https://git-scm.com/doc\"\n  }, \"https://git-scm.com/doc\")), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"Git Project\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Each set of changes to files are \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"commits\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Each commit has a \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"parent commit\"), \" (except for the first one)\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"The current commit is the \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"HEAD\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"The git project is kept in a remote location\\xA0- \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"repository\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Retrieving changes from the repo is \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"pulling\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Sending changes to the repo is \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"pushing\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"When choosing what to commit, files are \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"staged\"))), mdx(\"h2\", null, \"Git: branches\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"Branches\"), \"\\xA0- independent set of commits\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"So far all commits are on the \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"master\"), \" branch\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Branch can be an abstraction for a line of development\", mdx(\"ul\", {\n    parentName: \"li\"\n  }, mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"master\"), \" is the stable, tested version of the project\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"develop\"), \" is the place where features come together\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"feature\"), \" is the branch for a single feature\")))), mdx(\"p\", null, \"A branch can be temporary:\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"To have a change request\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"To develop an independent feature\")), mdx(\"p\", null, mdx(\"span\", {\n    parentName: \"p\",\n    \"className\": \"gatsby-resp-image-wrapper\",\n    \"style\": {\n      \"position\": \"relative\",\n      \"display\": \"block\",\n      \"marginLeft\": \"auto\",\n      \"marginRight\": \"auto\",\n      \"maxWidth\": \"614px\"\n    }\n  }, \"\\n      \", mdx(\"a\", {\n    parentName: \"span\",\n    \"className\": \"gatsby-resp-image-link\",\n    \"href\": \"/static/62a1d3bbfc7f7ddb64e265025ea6a594/9453e/git_branch.jpg\",\n    \"style\": {\n      \"display\": \"block\"\n    },\n    \"target\": \"_blank\",\n    \"rel\": \"noopener\"\n  }, \"\\n    \", mdx(\"span\", {\n    parentName: \"a\",\n    \"className\": \"gatsby-resp-image-background-image\",\n    \"style\": {\n      \"paddingBottom\": \"52.14723926380368%\",\n      \"position\": \"relative\",\n      \"bottom\": \"0\",\n      \"left\": \"0\",\n      \"backgroundImage\": \"url('data:image/jpeg;base64,/9j/2wBDABALDA4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkzODdASFxOQERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVGC8aGi9jQjhCY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2P/wgARCAAKABQDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAAAgADBf/EABUBAQEAAAAAAAAAAAAAAAAAAAEA/9oADAMBAAIQAxAAAAHtrJQ5Q//EABkQAAEFAAAAAAAAAAAAAAAAAAACEDFBQv/aAAgBAQABBQKiDCW//8QAFREBAQAAAAAAAAAAAAAAAAAAEBH/2gAIAQMBAT8Bp//EABURAQEAAAAAAAAAAAAAAAAAABAR/9oACAECAQE/AYf/xAAWEAADAAAAAAAAAAAAAAAAAAAQIDH/2gAIAQEABj8CET//xAAaEAEAAwADAAAAAAAAAAAAAAABACFBEBFx/9oACAEBAAE/IS+1uQcJ6MF1sdvH/9oADAMBAAIAAwAAABCw/wD/xAAWEQEBAQAAAAAAAAAAAAAAAAAAARH/2gAIAQMBAT8QNj//xAAWEQEBAQAAAAAAAAAAAAAAAAAAESH/2gAIAQIBAT8Qyj//xAAbEAEBAAIDAQAAAAAAAAAAAAABEQAhEDFBYf/aAAgBAQABPxCS7l8LMGAtNTWsFoKG0mTWre7iNldev3j/2Q==')\",\n      \"backgroundSize\": \"cover\",\n      \"display\": \"block\"\n    }\n  }), \"\\n  \", mdx(\"img\", {\n    parentName: \"a\",\n    \"className\": \"gatsby-resp-image-image\",\n    \"alt\": \"Git branches\",\n    \"title\": \"Git branches\",\n    \"src\": \"/static/62a1d3bbfc7f7ddb64e265025ea6a594/9453e/git_branch.jpg\",\n    \"srcSet\": [\"/static/62a1d3bbfc7f7ddb64e265025ea6a594/d2f63/git_branch.jpg 163w\", \"/static/62a1d3bbfc7f7ddb64e265025ea6a594/c989d/git_branch.jpg 325w\", \"/static/62a1d3bbfc7f7ddb64e265025ea6a594/9453e/git_branch.jpg 614w\"],\n    \"sizes\": \"(max-width: 614px) 100vw, 614px\",\n    \"style\": {\n      \"width\": \"100%\",\n      \"height\": \"100%\",\n      \"margin\": \"0\",\n      \"verticalAlign\": \"middle\",\n      \"position\": \"absolute\",\n      \"top\": \"0\",\n      \"left\": \"0\"\n    },\n    \"loading\": \"lazy\",\n    \"decoding\": \"async\"\n  }), \"\\n  \"), \"\\n    \")), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Create branches or switch between them with \", mdx(\"code\", {\n    parentName: \"li\",\n    \"className\": \"language-text\"\n  }, \"git branch\"))), mdx(\"h2\", null, \"Git: tags\"), mdx(\"p\", null, \"So far:\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"changes are managed, not the project\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"all the commits come one after the other\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"the only version available in the commit id\")), mdx(\"p\", null, mdx(\"strong\", {\n    parentName: \"p\"\n  }, \"Tagging\"), \" versions:\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Tag a \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"commit\"), \" to be a particular software version\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"It easier to identify the versions\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"You have to \", mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"push\"), \" the tags\")), mdx(\"h2\", null, \"Git: merge & conflicts\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Branches can be merged to have all the changes in only one branch\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"When multiple changes conflict with each other, the merge fails: \", mdx(\"code\", {\n    parentName: \"li\",\n    \"className\": \"language-text\"\n  }, \"Automatic merge failed; fix conflicts and then commit the result.\")), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Solutions:\", mdx(\"ul\", {\n    parentName: \"li\"\n  }, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Cherrypick the changes (can be quite long)\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Abandon your changes (and put them back later)\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Work on the latest commit (git pull) and have a good task repartition\")))), mdx(\"h2\", null, \"Git: merge vs rebase\"), mdx(\"p\", null, mdx(\"span\", {\n    parentName: \"p\",\n    \"className\": \"gatsby-resp-image-wrapper\",\n    \"style\": {\n      \"position\": \"relative\",\n      \"display\": \"block\",\n      \"marginLeft\": \"auto\",\n      \"marginRight\": \"auto\",\n      \"maxWidth\": \"650px\"\n    }\n  }, \"\\n      \", mdx(\"a\", {\n    parentName: \"span\",\n    \"className\": \"gatsby-resp-image-link\",\n    \"href\": \"/static/a4939bc147509987f8065ab453f07825/3f8a9/merge-vs-rebase.jpg\",\n    \"style\": {\n      \"display\": \"block\"\n    },\n    \"target\": \"_blank\",\n    \"rel\": \"noopener\"\n  }, \"\\n    \", mdx(\"span\", {\n    parentName: \"a\",\n    \"className\": \"gatsby-resp-image-background-image\",\n    \"style\": {\n      \"paddingBottom\": \"71.16564417177914%\",\n      \"position\": \"relative\",\n      \"bottom\": \"0\",\n      \"left\": \"0\",\n      \"backgroundImage\": \"url('data:image/jpeg;base64,/9j/2wBDABALDA4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkzODdASFxOQERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVGC8aGi9jQjhCY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2P/wgARCAAOABQDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAEF/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAH/2gAMAwEAAhADEAAAAd5RER//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAEFAl//xAAUEQEAAAAAAAAAAAAAAAAAAAAQ/9oACAEDAQE/AT//xAAUEQEAAAAAAAAAAAAAAAAAAAAQ/9oACAECAQE/AT//xAAUEAEAAAAAAAAAAAAAAAAAAAAg/9oACAEBAAY/Al//xAAYEAEBAQEBAAAAAAAAAAAAAAABABEQMf/aAAgBAQABPyEjyzgZLjf/2gAMAwEAAgADAAAAEDQ//8QAFBEBAAAAAAAAAAAAAAAAAAAAEP/aAAgBAwEBPxA//8QAFBEBAAAAAAAAAAAAAAAAAAAAEP/aAAgBAgEBPxA//8QAGxABAAMBAAMAAAAAAAAAAAAAAQARIUEQcbH/2gAIAQEAAT8QNPu/syt5cBRqZx8AKJnbP//Z')\",\n      \"backgroundSize\": \"cover\",\n      \"display\": \"block\"\n    }\n  }), \"\\n  \", mdx(\"img\", {\n    parentName: \"a\",\n    \"className\": \"gatsby-resp-image-image\",\n    \"alt\": \"Merge vs Rebase\",\n    \"title\": \"Merge vs Rebase\",\n    \"src\": \"/static/a4939bc147509987f8065ab453f07825/6aca1/merge-vs-rebase.jpg\",\n    \"srcSet\": [\"/static/a4939bc147509987f8065ab453f07825/d2f63/merge-vs-rebase.jpg 163w\", \"/static/a4939bc147509987f8065ab453f07825/c989d/merge-vs-rebase.jpg 325w\", \"/static/a4939bc147509987f8065ab453f07825/6aca1/merge-vs-rebase.jpg 650w\", \"/static/a4939bc147509987f8065ab453f07825/3f8a9/merge-vs-rebase.jpg 855w\"],\n    \"sizes\": \"(max-width: 650px) 100vw, 650px\",\n    \"style\": {\n      \"width\": \"100%\",\n      \"height\": \"100%\",\n      \"margin\": \"0\",\n      \"verticalAlign\": \"middle\",\n      \"position\": \"absolute\",\n      \"top\": \"0\",\n      \"left\": \"0\"\n    },\n    \"loading\": \"lazy\",\n    \"decoding\": \"async\"\n  }), \"\\n  \"), \"\\n    \")), mdx(\"p\", null, \"Read this \", mdx(\"a\", {\n    parentName: \"p\",\n    \"href\": \"https://medium.com/datadriveninvestor/git-rebase-vs-merge-cc5199edd77c\"\n  }, \"article on Medium\"), \".\"), mdx(\"h2\", null, \"OpenSource Project Management\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Code managed by git, how can people contribute?\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, mdx(\"strong\", {\n    parentName: \"li\"\n  }, \"Fork\"), \" the project on your account\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Work on a change on your fork\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Ask for your changes to be added to the official code - \", mdx(\"a\", {\n    parentName: \"li\",\n    \"href\": \"https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests\"\n  }, \"pull request\"))), mdx(\"h2\", null, \"Project management with GitLab\"), mdx(\"p\", null, \"Provides from basic issue tracking to scrum and kanban style\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Track and manage issues \"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Issue boards to visualize work\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Agile project management\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"DevOps pipeline traceability\")), mdx(\"p\", null, mdx(\"a\", {\n    parentName: \"p\",\n    \"href\": \"https://about.gitlab.com/solutions/project-management/\"\n  }, \"Read more about GitLab project management\"), \".\"), mdx(\"h2\", null, \"Git flow strategies\"), mdx(\"ul\", null, mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"Git Flow\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"GitHub Flow\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"GitLab Flow\"), mdx(\"li\", {\n    parentName: \"ul\"\n  }, \"One Flow\")), mdx(\"p\", null, mdx(\"a\", {\n    parentName: \"p\",\n    \"href\": \"https://medium.com/@patrickporto/4-branching-workflows-for-git-30d0aaee7bf\"\n  }, \"Read more\")));\n}\n;\nMDXContent.isMDXComponent = true;"}}},"pageContext":{}},
    "staticQueryHashes": []}