2021年2月5日星期五

the modified file pulled through git pull origin master is not shown as changed even though git log confirms the pull

I have a branch and wanted to git the changes in the master using $ git pull origin master After I do this, the pull really didn't show any merged PR being pulled and said it's already updated. However, the git log shows the last merged PR.

So how can I get the latest changes (a merged PR) on this branch?

Doing the $ git pull origin master on the master branch shows the merged PR being pulled.

How can I fix this problem? Since the README.md that I have merged its PR on the Github page, and also was able to use git pull origin master and pull it to master is not being pulled into this new branch.

$ git branch    dataprocessing    master  * toyota  

When in the branch:

$ git merge master  Already up to date.  

and

$ git branch -vv    dataprocessing dcaa9f9 Merge pull request #122 from XYZaiXYZ/toyota    master         dcaa9f9 [origin/master] Merge pull request #122 from XYZaiXYZ/toyota  * toyota         dcaa9f9 [origin/toyota: ahead 1] Merge pull request #122 from XYZaiXYZ/toyota  

Additionally, the following yields no results:

$ git diff origin master  

This is what I see in the README.md in local branch toyota: enter image description here

This is what I see in the README.md in GitHub PR which I merged: enter image description here

This is what I see when I browse to the actual README.md in GitHub website: enter image description here

This is what I see if I $ git checkout master, as you see even in master after pulled update the README.md is not changed: enter image description here

$ git checkout toyota  Switched to branch 'toyota'  Your branch is ahead of 'origin/toyota' by 1 commit.    (use "git push" to publish your local commits)    $ git merge origin master  Already up to date.    $ git log README.md   commit ac7cXXXX (origin/toyota)  Author: Mona Jalal <mona@XYZ>  Date:   Fri Feb 5 22:40:32 2021 +0000        fixed two typos in the README.md    $ git pull origin master  From ssh://github.com/XYZaiXYZ/vision   * branch            master     -> FETCH_HEAD  Already up to date.  

I have merged #122 PR to master myself and I see this when I enter the git repo: enter image description here

$ git checkout master  $ git log  commit dcaa9XYZ (HEAD -> master, origin/master, origin/HEAD, toyota, dataprocessing)  Merge: 3b29485 ac7c61e  Author: Mona Jalal <76495162+XYZ@users.noreply.github.com>  Date:   Fri Feb 5 17:44:36 2021 -0500        Merge pull request #122 from XYZaiXYZ/toyota            fixed two typos in the README.md  

I also did git clone the repo in a test dir and I can see the changes are shown in this new clone enter image description here

https://stackoverflow.com/questions/66072103/the-modified-file-pulled-through-git-pull-origin-master-is-not-shown-as-changed February 06, 2021 at 07:48AM

没有评论:

发表评论