零基础小白自学 Git_Github 教程，IDEA 中使用 Git 基础，rebase 和 merge 的区别，笔记16 - 指南
<style>pre { white-space: pre !important; word-wrap: normal !important; overflow-x: auto !important; display: block !important; font-family: "Consolas", "Monaco", "Courier New", monospace !important; font-size: 14px !important; line-height: 1.6 !important; padding: 16px !important; margin: 16px 0 !important; background-color: rgba(248, 248, 248, 1) !important; border: 1px solid rgba(225, 228, 232, 1) !important; border-radius: 6px !important; tab-size: 4 !important; -moz-tab-size: 4 !important; max-width: 100% !important; box-sizing: border-box !important }code { font-family: "Consolas", "Monaco", "Courier New", monospace !important; font-size: 14px !important; white-space: pre !important; word-wrap: normal !important; word-break: normal !important; overflow-wrap: normal !important; display: inline !important; background: rgba(0, 0, 0, 0) !important; border: none !important; padding: 0 !important; margin: 0 !important; line-height: inherit !important }
pre code { background: rgba(0, 0, 0, 0) !important; border: 0 !important; border-radius: 0 !important; display: block !important; line-height: 1.6 !important; margin: 0 !important; max-width: none !important; overflow: visible !important; padding: 0 !important; white-space: pre !important; word-wrap: normal !important; word-break: normal !important; color: inherit !important }
.token.comment, .token.prolog, .token.doctype, .token.cdata { color: rgba(112, 128, 144, 1) !important; font-style: italic !important }
.token.punctuation { color: rgba(153, 153, 153, 1) !important }
.token.atrule, .token.attr-value, .token.keyword { color: rgba(0, 119, 170, 1) !important; font-weight: bold !important }
.token.function, .token.class-name { color: rgba(221, 74, 104, 1) !important; font-weight: bold !important }
.token.selector, .token.attr-name, .token.string, .token.char, .token.builtin, .token.inserted { color: rgba(102, 153, 0, 1) !important }
.token.property, .token.tag, .token.boolean, .token.number, .token.constant, .token.symbol, .token.deleted { color: rgba(153, 0, 85, 1) !important }
.cnblogs-markdown pre, .cnblogs-post-body pre { white-space: pre !important; word-wrap: normal !important; overflow-x: auto !important; background-color: rgba(248, 248, 248, 1) !important; border: 1px solid rgba(225, 228, 232, 1) !important; border-radius: 6px !important; padding: 16px !important; margin: 16px 0 !important }
pre, pre, pre { white-space: pre !important; word-wrap: normal !important; overflow-x: auto !important }</style>
<div class="markdown_views prism-atom-one-dark" id="content_views"><svg style="display: none" xmlns="http://www.w3.org/2000/svg"><path d="M5,0 0,2.5 5,5z" id="raphael-marker-block" stroke-linecap="round" style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0)"></path></svg><h2>零基础小白自学 Git_Github 教程，IDEA 中采用Git 基础，笔记16</h2><h3>一、参考资料</h3><p>IDEA 中使用Git </p><h3>二、笔记总结</h3><h4>2.1、Idea 简介</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/8def1f0ba3f449b3af4a107308db2db8.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/2df61f26e0204fa68f535090315371af.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/062549178d30445aaf4797f3de1799df.png"></p><h4>2.2、克隆项目</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/c9311dc2423c4221a074531ce5a1a70b.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/93695638f0724ce9af5a6bda471da3be.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/ac6d21acd0624d2a98f60be82d312c8c.png"></p><h4>2.3、Git .ignore 文件</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/a0ee9557eefd4fa19020c5dc772b0543.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/859a48c659174efba0ac39b2bf17ef41.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/647ec945816e4ff9af226d5ffca48e2b.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/23ea42af2d854632b1cbecb853808be1.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/ac8664343eb942189bfe33f17d6333d9.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/f10080b392774f2ca295012473abec60.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/041d2646a7e44d83981a993aecc557ff.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/db69b47740134cb094e03ae075651038.png"></p><h4>2.4、新增文件并添加到暂存区</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/e01c4754eec34da3af7b1c5d74b1d7af.png"></p><h4>2.5、拉取最新代码</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/ec7d120109c448caaec51b491f193cb7.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/352dde5624d94be88967913ce70124bd.png"></p><h4>2.6、创建分支</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/b081a716405e491baf162b4353c92bc4.png"></p><h4>2.7、切换分支</h4><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/91911472ccd643fe8c464a5bd19c0277.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/4a7c9b96bd0947b29a21b874c6b13497.png"></p><h4>2.8、合并分支</h4><h5>团队开发中推荐使用 merge，禁止使用 rebase</h5><p><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/55d66093d45b45f48d4951642e67ca4a.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/84b5cae299f84453a72d5cdb2b67feea.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/e5bc95660e4a4b1497a0c32868b97305.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/7cc9315803db45219480dc7a32d7d8ed.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/90d34aa3ab26452ea028c979f1b87eed.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/b2e6f8569dfd43a392a7f77bebd375c8.png"><br><img alt="在这里插入图片描述" src="https://i-blog.csdnimg.cn/direct/cc34b3ed742d4d6ab8ebe0e4450b1bff.png"></p></div><br><br>
来源：https://www.cnblogs.com/jzssuanfa/p/19605296
頁:
[1]