yg真可爱.txt

yg真可爱
yg太强了
浅试了一下分支的上传，但是在之后merge时出现了一些奇怪的问题，我已经乱了
E325: ATTENTION
Found a swap file by the name "~/Desktop/gitlearn/BUPTSmartCarLearning/.git/.MERGE_MSG.swp"
          owned by: 97329   dated: Fri Sep 08 21:44:48 2023
         file name: ~97329/Desktop/gitlearn/BUPTSmartCarLearning/.git/MERGE_MSG
          modified: YES
         user name: 97329   host name: starry
        process ID: 1979
While opening file "/c/Users/97329/Desktop/gitlearn/BUPTSmartCarLearning/.git/MERGE_MSG"
             dated: Fri Sep 08 21:46:56 2023
      NEWER than swap file!

(1) Another program may be editing the same file.  If this is the case,
    be careful not to end up with two different instances of the same
    file when making changes.  Quit, or continue with caution.
(2) An edit session for this file crashed.
    If this is the case, use ":recover" or "vim -r /c/Users/97329/Desktop/gitlearn/BUPTSmartCarLearnin
g/.git/MERGE_MSG"
    to recover the changes (see ":help recovery").
    If you did this already, delete the swap file "/c/Users/97329/Desktop/gitlearn/BUPTSmartCarLearnin
g/.git/.MERGE_MSG.swp"
    to avoid this message.

Swap file "~/Desktop/gitlearn/BUPTSmartCarLearning/.git/.MERGE_MSG.swp" already exists!
[O]pen Read-Only, (E)dit anyway, (R)ecover, (D)elete it, (Q)uit, (A)bort: