Code Push

最新推荐文章于 2026-05-31 18:23:00 发布

转载最新推荐文章于 2026-05-31 18:23:00 发布 · 2.9k 阅读

本文详细介绍了如何使用Git进行代码版本控制，包括创建分支、合并、提交、推送等核心操作，以及如何解决冲突和使用特定命令进行高效管理。

【首先rebase】

copy changes

cat .git/config

git reset --hard HEAD

git fetch /proj/repo01/product/swordfishrl/swdfs_release/platform/packages/apps/Mms.git swdfs_gb_dev:swdfs_gb_dev

git rebase swdfs_gb_dev

git rebase [-i | --interactive] [options] [--onto <newbase>] <upstream> [<branch>]
git rebase [-i | --interactive] [options] –onto <newbase> –root [<branch>]
git rebase –continue | –skip | –abort

【Note first】

CR: IKDINARATD-158

BranchName: IKDINARATD-158_yesya_13070107_SmartDialerLayout

A white screen display when select cancel in SIM card contacts edit screen

【Commit】

git branch IKDINARATD-158_yesya_13070107_SmartDialerLayout

git checkout IKDINARATD-158_yesya_13070107_SmartDialerLayout

git status

git add +filenames

然后git commit：

注释是IKAROWANA-1080 A white screen display when select cancel in SIM card contacts edit screen(描述)

git commit –a –m “IKSF-7773: Long SMS can not be displayed if some parts are not received”

【Push】

cat .git/config

git push /proj/repo01/product/swordfishrl/swdfs_release/platform/packages/apps/Mms.git IKSF-7773_nwdb38_zch45_LongSMS:swdfs_gb_dev

【Other Command】

//git show HEAD > IKAROWANA-601.patch

git format-patch > IKAROWANA-601.patch +你需要比较的那个commit的ID,就会生成出当前和那次commit的diff

git-am 可以合并

git-diffs -webrev -b IKAROWANA-601_zch45_nwdb38_delete_all

【Push】

需要Beijing glocu371权限
1: pl
cd Arowana: /product/arowana/release/dev-bare/frameworks/base.git
./Push-br-remote.pl -p arowana -b IKAROWANA-4970_nwdb38_zch45_ChineseNameRecognize:motorola/packages/blur
./Push-br-remote.pl -p arowana -b IKAROWANA-8379_nwdb38_zch45_DialerLandscapePorting:motorola/cbs/china/packages/apps/Contacts/
2：或者 git push
git push ssh://zch68rep01.ap.mot.com/proj/repo01/product/arowana/release/dev-bare/motorola/cbs/china/packages/apps/Contacts.git IKAROWANA-1225_zch45_nwdb38_AcceleratorSlider

【After BR】
/proj/repo29/product/arowana/release/dev-bare:motorola/packages/blur:IKAROWANA-1797_zch45_nwdb38_SMSPickerSearch
【查看在Beijing服务器的状态】
ssh zch68lnxlog01
/proj/repo01/product/arowana/release/dev-bare/motorola/packages/blur.git > git log
/proj/repo01/product/arowana/release/dev-bare/motorola/cbs/china/packages/apps/Contacts.git

如果没有成功先删除自己提交的内容然后再rebase
先进入rebase目录cd /motorola/packages/blur
git pull --rebase ssh://zch68rep01.ap.mot.com/proj/repo01/product/arowana/release/dev-bare/motorola/packages/blur.git cm/arwn_trunk
git reset --hard HEAD
然后再提交