cmda-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Pan, Lei (398K)" <>
Subject error in git pull
Date Sun, 20 Mar 2016 08:03:53 GMT

From: JPL <<>>
Date: Sunday, March 20, 2016 at 1:00 AM
To: Qihao Bao <<>>
Cc: "<>" <<>>
Subject: <no subject>

Hi Qihao:

I tried to git pull from inside our Docker container
so I can get the latest version and continue editing
some html files, but I got the following error. If you recall,
in our last meeting, I asked you whether or not the *.class
files are put into revision control. This error seems
to indicate that they are.

Could you please take a look at this issue and see
if you need to remove a few files from the repository?
Or let me know how I can walk around this error?


svc@0e846b47d4e8:~/JPL-WebService$ git pull
Username for '':<>
Password for '':
remote: Counting objects: 529, done.
remote: Compressing objects: 100% (40/40), done.
remote: Total 529 (delta 166), reused 146 (delta 146), pack-reused 343
Receiving objects: 100% (529/529), 4.64 MiB | 3.87 MiB/s, done.
Resolving deltas: 100% (342/342), completed with 64 local objects.
   90cb3a2..cdcb6db  master     -> origin/master
 * [new branch]      CMDA-Integration -> origin/CMDA-Integration
   223bce7..0382ba5  CMU-Backend -> origin/CMU-Backend
   0081248..bdb8368  CMU-Frontend -> origin/CMU-Frontend
Updating 90cb3a2..cdcb6db
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.

  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message