Click here to Skip to main content
15,887,683 members
Please Sign up or sign in to vote.
0.00/5 (No votes)
My local branch name===> (Development)
$ git status
On branch Development
Your branch and 'origin/Development' have diverged,
and have 3 and 5 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean


How to fix this issue

What I have tried:

if I am doing the git pull getting the below message: i have nothing to commit also. everything is committed in my local branch

$ git pull
error: The following untracked working tree files would be overwritten by merge:
        .vs/S2P_LegalPortal_ServiceLayer/config/applicationhost.config
        .vs/S2P_LegalPortal_ServiceLayer/v16/.suo
        S2P_LegalPortal_BLLayer/S2P_LegalPortal_BLLayer.csproj.user
        S2P_LegalPortal_BLLayer/bin/Debug/EntityFramework.dll
SOME MORE FILES ARE LISTED HERE
        S2P_LegalPortal_CommonLayer/obj/Debug/S2P_LegalPortal_CommonLayer.dll
        S2P_LegalPortal_CommonLayer/obj/Debug/S2P_LegalPortal_CommonLayer.pdb
        S2P_LegalPortal_DBLayer/S2P_LegalPortal_DBLayer.csproj.user
        S2P_LegalPortal_DBLayer/bin/Debug/EntityFramework.
Aborting
Posted
Updated 12-Nov-20 6:07am

1 solution

 
Share this answer
 

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)



CodeProject, 20 Bay Street, 11th Floor Toronto, Ontario, Canada M5J 2N8 +1 (416) 849-8900