{
    "componentChunkName": "component---src-templates-note-note-js",
    "path": "/notes/rebase-versus-merge",
    "result": {"data":{"mdx":{"body":"var _excluded = [\"components\"];\nfunction _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }\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; }\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/* @jsxRuntime classic */\n/* @jsx mdx */\n\nvar _frontmatter = {};\nvar layoutProps = {\n  _frontmatter: _frontmatter\n};\nvar MDXLayout = \"wrapper\";\nreturn function MDXContent(_ref) {\n  var components = _ref.components,\n    props = _objectWithoutProperties(_ref, _excluded);\n  return mdx(MDXLayout, _extends({}, layoutProps, props, {\n    components: components,\n    mdxType: \"MDXLayout\"\n  }), mdx(\"p\", null, \"hint: You have divergent branches and need to specify how to reconcile them.\\nhint: You can do so by running one of the following commands sometime before\\nhint: your next pull:\\nhint:\\nhint:   git config pull.rebase false  # merge\\nhint:   git config pull.rebase true   # rebase\\nhint:   git config pull.ff only       # fast-forward only\\nhint:\\nhint: You can replace \\\"git config\\\" with \\\"git config --global\\\" to set a default\\nhint: preference for all repositories. You can also pass --rebase, --no-rebase,\\nhint: or --ff-only on the command line to override the configured default per\\nhint: invocation.\"), mdx(\"p\", null, \"\", mdx(\"a\", {\n    parentName: \"p\",\n    \"href\": \"/notes/TODO\",\n    \"title\": \"TODO\"\n  }, \"TODO\"), \"\"));\n}\n;\nMDXContent.isMDXComponent = true;","inboundReferences":[]}},"pageContext":{"slug":"rebase-versus-merge","node":{"childMdx":{"slug":"rebase-versus-merge"}}}},
    "staticQueryHashes": []}