从零开始的git实战之CAF TAG的合并

获取代码
合并代码

CAF TAG是CodeAurora放出的代码（至于这个网站到底属不属于高通存疑它似乎属于Linux Foundation）
你可以在这里找到每个CAF TAG对应的芯片组以及安卓版本
此处以内核为例

获取代码

此处以msm-4.4为例
首先CAF放出了新的8998的TAG

 March 26, 2020      LA.UM.8.4.r1-05300-8x98.0      msm8998     LA.UM.8.4.r1-05300-8x98.0.xml     10.00.00

我们前往msm-4.4的对应仓库

可以看到，我们的目标tag在这里

于是我们在终端执行

$ git fetch https://source.codeaurora.org/quic/la/kernel/msm-4.4 LA.UM.8.4.r1-05300-8x98.0
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-67df60f7a759d51a23079ce5839908256859c2a0.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-7474ee51010792fb6dedcf4a5d31a41c529789fd.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-7a57bcc8eb161135dd60a05bd45cca2244c08e71.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-1aca7dd5046f42a8fac0e6e488bb3bcd67e0f5ac.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-4a0b8945b0bcdf275e55d9b8b232345c8dc81950.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-129cd868ff24e4c474a6ccfeb5f2b358d74962e9.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-a0e36acdf4dc1c89e24f045d3a7da14b590526a3.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-bfa202734d4a1e8b858896349d8bc6b0dc222639.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-739110252c8d96790290224087f199766fd3c810.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-340ba49e6997b93f7c918f6ef81444304b4818e0.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-cbe5beb1059c0f788a4b4c038e21b31ef05770cf.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-87b938d788581be569fd90f5deaeecbb0c3fc048.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-05cf46db8bba322eb5469f144883bea93680b43c.pack
remote: warning: ignoring extra bitmap file: /var/lib/git/cafsource/quic/la/kernel/msm.git/objects/pack/pack-115954ea7c6029832c7be57609b3c6ba40a9f054.pack
remote: Enumerating objects: 196, done.
remote: Counting objects: 100% (196/196), done.
remote: Compressing objects: 100% (74/74), done.
remote: Total 196 (delta 137), reused 167 (delta 122)
接收对象中: 100% (196/196), 96.68 KiB | 575.00 KiB/s, 完成.
处理 delta 中: 100% (137/137), 完成 6 个本地对象.
来自 https://source.codeaurora.org/quic/la/kernel/msm-4.4
 * tag                         LA.UM.8.4.r1-05300-8x98.0 -> FETCH_HEAD

合并代码

我们执行合并

$ git merge FETCH_HEAD 
自动合并 drivers/video/fbdev/msm/mdss_hdcp_1x.c
冲突（内容）：合并冲突于 drivers/video/fbdev/msm/mdss_hdcp_1x.c
自动合并失败，修正冲突然后提交修正的结果。

可以看到出现了冲突
我们查看冲突文件

$ git status 
位于分支 kernel.lnx.4.4.r39-rel

您有尚未合并的路径。
  （解决冲突并运行 "git commit"）
  （使用 "git merge --abort" 终止合并）

要提交的变更：

    修改：     drivers/video/fbdev/msm/mdss_cec_core.c
    修改：     drivers/video/fbdev/msm/mdss_cec_core.h
    修改：     drivers/video/fbdev/msm/mdss_hdmi_cec.c
    修改：     net/ipc_router/ipc_router_security.c

未合并的路径：
  （使用 "git add <文件>..." 标记解决方案）

    双方修改：   drivers/video/fbdev/msm/mdss_hdcp_1x.c

我们也可以直接在终端查看冲突内容

$ git diff
diff --cc drivers/video/fbdev/msm/mdss_hdcp_1x.c
index 9166d8756944,0b394ea270cd..000000000000
--- a/drivers/video/fbdev/msm/mdss_hdcp_1x.c
+++ b/drivers/video/fbdev/msm/mdss_hdcp_1x.c
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +/* Copyright (c) 2010-2017, 2019, The Linux Foundation. All rights reserved.
++=======
+ /* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
++>>>>>>> 893d12e4fa1d6f322d400435ad77149f991ffc75
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 and

看起来问题不大，这种日期的冲突我最喜欢了
怎么解决还用说吗肯定时留新的啊

/* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

解决完所有冲突后
git commit -a
或者你也可以一个一个git add最后git commit
git 会自动生成commit信息

Merge tag 'LA.UM.8.4.r1-05300-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into kernel.lnx.4.4.r39-rel

"LA.UM.8.4.r1-05300-8x98.0"

保存后就算完成了

$ git commit -a
[kernel.lnx.4.4.r39-rel bbb9381eb3d7] Merge tag 'LA.UM.8.4.r1-05300-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into kernel.lnx.4.4.r39-rel

然后我们git push就能在GitHub上看到这次合并了

获取代码

合并代码

评论