我在提交代码的时候突然发现别人刚才提交了一点代码,我没有拉取导致问题,请问怎么解决

问:

回答:

问:

我跟随输入git pull ,然后又以下提示:

Merge branch 'systemPower_dev' of https://xxxx.com into xxxx_dev

# Please enter a commit message to explain why this merge is necessary,

# especially if it merges an updated upstream into a topic branch.

#

# Lines starting with '#' will be ignored, and an empty message aborts

# the commit.

~

~

~

~

~

~

~

~

"~/Desktop/xxxx/.git/MERGE_MSG" 6L, 339B

回答:

问:

我直接输入:wq,以下是代码:

xxxxx用户电脑名 % git pull remote: Counting objects: 8, done.

remote: Compressing objects: 100% (7/7), done.

remote: Total 8 (delta 0), reused 0 (delta 0) Unpacking

objects: 100% (8/8), 11.37 KiB | 2.27 MiB/s, done. From https://xxxx.com f325e8a7..280220eb xxxx_dev -> origin/xxxx_dev Merge made by the 'ort' strategy.

name.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

回答:

问:

请问刚才我修改的代码现在还有吗?

回答: