首页 > 编程知识 正文

git提交代码覆盖别人的代码,git日志乱码

时间:2023-05-06 20:13:39 阅读:31913 作者:571

(一) )。

1.

在适当的乱码工程下

$ rm -rf Launcher/

2.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/packages/apps/hsae _ apps

$.//.//Repo/ReposyncLauncher

出现: error :repo/manifests/: containsuncommittedchanges

3.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/packages/apps/hsae _ apps

$ CD .//./. repo /

4.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo

$ git status

5.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo

$ CD管理

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ git status

位于分支default中

您的分支落后于“origin/cn202sr-id”的合计一个提交,可以快进。

(使用" git pull "更新本地分支)

未准备提交的更改:

(更新在' git add . '中提交的内容)

(在' git checkout -- '中放弃工作区更改)

修改: default.xml

尚未参与提交的修改(使用(git add )或(git commit -a ) ) ) ) ) ) ) ) )。

6.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ git reset --hard HEAD

HEAD目前位于49446 C1 addstaticmanifestcn 202 Sr-id-sabresd _ 6dq-2018-11-08-12-12-45

7.Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107

$ ls

打包软件

8.Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ ls

cn202sr-id default.xml

9.Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ git status

位于分支default中

您的分支落后于“origin/cn202sr-id”的总计一个提交,可以快进。

(使用" git pull "更新本地分支)

未准备提交的更改:

(更新在' git add . '中提交的内容)

(在' git checkout -- '中放弃工作区更改)

修改: default.xml

尚未参与提交的修改(使用(git add )或(git commit -a ) ) ) ) ) ) ) ) )。

10.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ git reset --hard HEAD

HEAD目前位于49446 C1 addstaticmanifestcn 202 Sr-id-sabresd _ 6dq-2018-11-08-12-12-45

11.

Miao jianyuwx @ Miao jianyu/cy gdrive/d/git _ repos/id _ 1107/. repo/manifests

$ git pull

更新49446c1.191b5d2

快速前锋

cn 202 Sr-id/cn 202 Sr-id-sabresd _ 6dq-2018-11-09-14-50-02.XML|650

1文件更改,65

0 insertions(+)

create mode 100644 cn202sr-id/CN202SR-ID-sabresd_6dq-2018-11-09-14-50-02.xml

12.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107

$ cp ../manifest.xml .repo/

13.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107

$ ../repo/repo sync packages/apps/Hsae_Apps/Launcher

Fetching project platform/packages/apps/Hsae_Apps/Launcher

Fetching project repo

Fetching projects: 100% (2/2), done.

14.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git branch -vva

cn202sr-id              f38c12d [hsae/cn202sr-id] Merge "Revert "Revert "[Launcher] impl Radio serviceCallback method""" into cn202sr-id

remotes/hsae/cn202sr    43f2d46 [Launcher] 小数点保留两位

remotes/hsae/cn202sr-id  f38c12d Merge "Revert "Revert "[Launcher] impl Radio serviceCallback method""" into cn202sr-id

remotes/hsae/master      7605c54 Initial empty repository

remotes/m/cn202sr-id    -> hsae/cn202sr-id

* (头指针分离自 91942dd) f38c12d Merge "Revert "Revert "[Launcher] impl Radio serviceCallback method""" into cn202sr-id

15.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git checkout cn202sr-id

切换到分支 'cn202sr-id'

您的分支与上游分支 'hsae/cn202sr-id' 一致。

16.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git status

位于分支 cn202sr-id

您的分支与上游分支 'hsae/cn202sr-id' 一致。

无文件要提交,干净的工作区

17.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git branch -vva

* cn202sr-id              f38c12d [hsae/cn202sr-id] Merge "Revert "Revert "[Launcher] impl Radio serviceCallback method""" into cn202sr-id

remotes/hsae/cn202sr    43f2d46 [Launcher] 小数点保留两位

remotes/hsae/cn202sr-id f38c12d Merge "Revert "Revert "[Launcher] impl Radio serviceCallback method""" into cn202sr-id

remotes/hsae/master    7605c54 Initial empty repository

remotes/m/cn202sr-id    -> hsae/cn202sr-id

18.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git pull

已经是最新的。

19.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git status

位于分支 cn202sr-id

您的分支与上游分支 'hsae/cn202sr-id' 一致。

尚未暂存以备提交的变更:

(使用 "git add ..." 更新要提交的内容)

(使用 "git checkout -- ..." 丢弃工作区的改动)

修改:    res/layout/wuling.xml

修改:    src/com/hsae/cn202sr/launcher/LauncherActivity.java

修改尚未加入提交(使用 "git add" 和/或 "git commit -a")

20.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git add .

21.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git status

位于分支 cn202sr-id

您的分支与上游分支 'hsae/cn202sr-id' 一致。

要提交的变更:

(使用 "git reset HEAD ..." 以取消暂存)

修改:    res/layout/wuling.xml

修改:    src/com/hsae/cn202sr/launcher/LauncherActivity.java

22.miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/Launcher

$ git commit -mtest

(二)

1.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107

$ cd .repo/

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/.repo

$ ls

manifest.xml  manifests.git  project-objects  repo

manifests    project.list  projects

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/.repo

$ cp ../../manifest.xml ./

2.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/.repo

$ cat manifest.xml

3.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107

$ ../repo/repo sync

4.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

$ git branch -vva

cn202sr-id                            dc44c72 [hsae/cn202sr-id: 落后 1] [SystemUI] repair Bluetooth and Wifi display icon

remotes/hsae/cn202sr                  6abdbb9 [SystemUI] add product_model LV1 (2/2)

remotes/hsae/cn202sr-id                60e065c [SystemUI]增加点击状态栏启动Wuling Appp

remotes/hsae/master                    9cc158a Initial empty repository

remotes/m/cn202sr-id                  -> hsae/cn202sr-id

* (头指针分离自 refs/heads/cn202sr-id) 60e065c [SystemUI]增加点击状态栏启动Wuling Appp

5.

miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

$ git checkout cn202sr-id

之前的 HEAD 位置是 60e065c [SystemUI]增加点击状态栏启动Wuling Appp

切换到分支 'cn202sr-id'

您的分支落后 'hsae/cn202sr-id' 共 1 个提交,并且可以快进。

(使用 "git pull" 来更新您的本地分支)

6.$ git pull

7.$ git status

8.$ git branch -vva

版权声明:该文观点仅代表作者本人。处理文章:请发送邮件至 三1五14八八95#扣扣.com 举报,一经查实,本站将立刻删除。