详细流程图解
首先找到idea菜单栏中git的位置,点击后如下图所示
我们常用的功能如下:
Commit(提交):将更新的代码提交到本地分支
Push(推送):将本地分支暂存的代码推送到远程分支(gitlab)
Pull(拉取):从远程分支拉取代码到你的分支
Commit(提交)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_6623e443ac4f4dbabe920e90d1dd3731.png?x-oss-process=image/resize,w_1400/format,webp)
点击Commit之后出现下图:
注意:一定要只勾选更改的src包下的内容,其余一律不勾选,否则将出现大量冲突
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_4698f4f0779b45579a113790a8de3be7.png?x-oss-process=image/resize,w_1400/format,webp)
![a71c2e0847834486a9ea12ddad344d67.png a71c2e0847834486a9ea12ddad344d67.png](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_ba8697ae4b1c444aa5fa58d72da31e5e.png?x-oss-process=image/resize,w_1400/format,webp)
Push(推送)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_8458550158c94371ae21a53aa8a3a3f5.png?x-oss-process=image/resize,w_1400/format,webp)
确认信息无误后,点击push将本地分支内容推送到远程分支
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_5a6442b3ed404e08970726c1c9539d29.png?x-oss-process=image/resize,w_1400/format,webp)
合并分支
首先确定是否已经成功推送到了gitlab上。
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_a2d2ad9b461e45a79d1e555cf5bdaff5.png?x-oss-process=image/resize,w_1400/format,webp)
如果推送成功,则进行下面的合并分支操作
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_a1abaefb03594370b5e5d65cd822c0ef.png?x-oss-process=image/resize,w_1400/format,webp)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_96fb49b17b904df88488fd4b7f32dd0f.png?x-oss-process=image/resize,w_1400/format,webp)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_1e870d4749cd4ab8bfe076efa93071c7.png?x-oss-process=image/resize,w_1400/format,webp)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_0101e47392e64ae496e953e97da721f2.png?x-oss-process=image/resize,w_1400/format,webp)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_7414a11253444332ae557aaf4fd4a4b2.png?x-oss-process=image/resize,w_1400/format,webp)
![](https://ucc.alicdn.com/pic/developer-ecology/ktusukdgwl7gq_f6d41bc84f3a4b8a8a3766043f8b6e0f.png?x-oss-process=image/resize,w_1400/format,webp)