idea操作gitee补充
<h4 id="31idea中使用git-远程仓库-创建与关联远程仓库gitee">31.IDEA中使用GIT-远程仓库-创建与关联远程仓库gitee</h4><h5 id="目标">目标</h5>
<p> gitee中创建远程仓库并在IDEA中关联远程仓库</p>
<h5 id="内容">内容</h5>
<ul>
<li>
<p>创建仓库</p>
<p>新建：git-project-sk</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143622711-544135837.png" alt="image-20210428164720972" loading="lazy"></p>
<p>创建步骤省略，如果忘记，可以查看<code>13.GIT远程仓库介绍与码云仓库注册创建</code>这个章节</p>
</li>
<li>
<p>关联远程仓库</p>
<p>Git--->Manage Remotes ....</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143622396-44897226.png" alt="image-20211110162832989" loading="lazy"></p>
<p>点击之后弹出窗口，点击+</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143622063-1278258470.png" alt="image-20211110162944914" loading="lazy"></p>
<p>复制git-project-sk 的https地址</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143621747-1353445411.png" alt="image-20210428164940541" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143621385-1626103602.png" alt="image-20210428164948615" loading="lazy"></p>
</li>
</ul>
<h4 id="32idea中使用git-远程仓库-拉取推送克隆远程仓库">32.IDEA中使用GIT-远程仓库-拉取、推送、克隆远程仓库</h4>
<h5 id="目标-1">目标</h5>
<p> 在IDEA中完成拉取、推送、克隆操作</p>
<h5 id="内容-1">内容</h5>
<ul>
<li>
<p>拉取：将码云上的内容拉取到本地</p>
<p>选择git-project-sk根目录,右键</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143621024-1938096097.png" alt="image-20211110163228110" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143620697-1774779719.png" alt="image-20211110170003068" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143620386-1003003182.png" alt="image-20211110170042350" loading="lazy"></p>
<p>第一次会拉取失败：</p>
<p>【1】</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143620049-827619972.png" alt="image-20211206144219222" loading="lazy"></p>
<p>【2】</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143619760-1043731798.png" alt="image-20211206144251019" loading="lazy"></p>
<p>【3】</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143619442-762942436.png" alt="image-20211206144324527" loading="lazy"></p>
<p>【4】</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143619119-2055343223.png" alt="image-20211206144338132" loading="lazy"></p>
<p>拉取完成后我们可以看见远程仓库中的文件已经来到本地仓库</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143618769-949035103.png" alt="image-20210428165443271" loading="lazy"></p>
</li>
<li>
<p>推送：将本地文件上传到码云上面</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143618386-2089035627.png" alt="image-20211110170239847" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143618060-808748600.png" alt="image-20211110170316066" loading="lazy"></p>
<p>推送成功提示</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143617716-2060269219.png" alt="image-20210428172248491" loading="lazy"></p>
<p>这时候去码云上查看：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143617370-1912565134.png" alt="image-20210428172301613" loading="lazy"></p>
<p>我们的本地代码就推送到了远程仓库</p>
</li>
<li>
<p>克隆 掌握</p>
<p>复制码云上仓库地址</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143617016-1060919485.png" alt="image-20210428173030048" loading="lazy"></p>
<p>在git-project-sk从远处git上克隆项目：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143616661-1439015069.png" alt="image-20211110170408584" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143616333-1713769115.png" alt="image-20211110170540281" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143616010-1537757045.png" alt="image-20211110170600036" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143615694-825283799.png" alt="image-20211110170727311" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143615385-2110902778.png" alt="image-20211110170747356" loading="lazy"></p>
<p>导入完成，如下：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143615066-1693318119.png" alt="image-20210524114655881" loading="lazy"></p>
</li>
</ul>
<h4 id="33idea中使用git-分支-创建合并删除分支">33.IDEA中使用GIT-分支-创建、合并、删除分支</h4>
<h5 id="目标-2">目标</h5>
<p> 在IDEA中完成分支创建、合并、删除操作</p>
<h5 id="内容-2">内容</h5>
<ul>
<li>
<p>创建分支</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143614731-964359348.png" alt="image-20210428173418156" loading="lazy"></p>
<p>创建的同时切换分支：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143614373-605165386.png" alt="image-20210428173442117" loading="lazy"></p>
<p>查看当前分支</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143614039-366714282.png" alt="image-20210428173455343" loading="lazy"></p>
</li>
<li>
<p>合并分支</p>
<p>编辑App.java,需要注意右下角当前分支为dev</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143613674-1504787870.png" alt="image-20210428173512928" loading="lazy"></p>
<p>提交缓存区代码到本地仓库上的dev分支上</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143613279-407878532.png" alt="image-20210428173528170" loading="lazy"></p>
<p>查看version control中的log,发现当前在dev环境上</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143612948-1988199788.png" alt="image-20210428173544381" loading="lazy"></p>
<p>切换回本地master分支</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143612571-497930011.png" alt="image-20210428173559116" loading="lazy"></p>
<p>切换完成：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143612193-1809519939.png" alt="image-20210428173715534" loading="lazy"></p>
<p>合并dev提交到master分支</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143611786-1843430133.png" alt="image-20210428173733013" loading="lazy"></p>
</li>
<li>
<p>删除分支</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143611371-1080303108.png" alt="image-20210428173745570" loading="lazy"></p>
<p>本地分支中就不会有dev分支了：</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143610944-303017596.png" alt="image-20210428173759534" loading="lazy"></p>
</li>
</ul>
<h4 id="34idea中使用git-版本冲突">34.IDEA中使用GIT-版本冲突</h4>
<h5 id="目标-3">目标</h5>
<p> 在IDEA中解决版本冲突</p>
<h5 id="内容-3">内容</h5>
<p>终于到达了用Git最让人讨厌的地方了，处理版本冲突。先说一下为什么会出冲突，如果一个用户连续对一个文件提交多个版本，其实每一个版本都是基于上一个版本的基础上修改的，这样就没有问题了。</p>
<p>但是当多个用户对同一个文件交叉修改的时候就尴尬了。A修改完提交一个，B修改完又提交一个，这个时候A修改完提交，问题来了，如果A提交成功，那么就相当于忽略了B提交的内容。这个时候就要强制你去处理一下这个问题，这就是我们所说的冲突问题。</p>
<ul>
<li>
<p>制造冲突</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143610558-691447641.png" alt="image-20210428174500598" loading="lazy"></p>
<p>在码云中对App.java 做如下编辑</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143610163-1621587799.png" alt="image-20210428174518025" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143609810-810793382.png" alt="image-20210428174528648" loading="lazy"></p>
<p>在IDEA中拉取代码</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143609428-1829585934.png" alt="image-20211110171241206" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143608992-647594778.png" alt="image-20211110171305292" loading="lazy"></p>
<p>这时候App的类变红色，且弹出窗口，需要手动进行合并</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143608672-1614162511.png" alt="image-20210428174600240" loading="lazy"></p>
</li>
<li>
<p>解决冲突</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143608247-81327887.png" alt="image-20210428174614355" loading="lazy"></p>
<p>选择主干</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143607894-2093039207.png" alt="image-20210428174628678" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143607509-616109500.png" alt="image-20210428174638479" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143607111-23695760.png" alt="image-20210428174708066" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143606687-898230577.png" alt="image-20210428174717105" loading="lazy"></p>
<p>提交远程仓库</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143606294-1792791215.png" alt="image-20211110171446514" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143605953-672910338.png" alt="image-20211110171509519" loading="lazy"></p>
</li>
<li>
<p>特殊错误</p>
<p>点击最上面的时候进行代码拉取的时候</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143605601-1883063128.png" alt="image-20210428181004821" loading="lazy"></p>
<p>IDEA git 拉取项目时报 No tracked branch configured for branch master or the branch doesn't exist的提示</p>
<p>选择本地工作空间右键</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143605161-1336854897.png" alt="image-20210428181031886" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143604641-930126708.png" alt="image-20210428181046335" loading="lazy"></p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143604274-689666446.png" alt="image-20210428181057012" loading="lazy"></p>
<p>输入：</p>
<pre><code>命令: git branch --set-upstream-to=origin/master
</code></pre>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143603927-821595062.png" alt="image-20210428181122671" loading="lazy"></p>
<p>IDEA中再次拉取</p>
<p><img src="https://img2023.cnblogs.com/blog/2305707/202303/2305707-20230306143603289-1926961575.png" alt="image-20210428181140986" loading="lazy"></p>
</li>
</ul><br><br>
来源：https://www.cnblogs.com/-turing/p/17183832.html
頁:
[1]