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
$ 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
git pull --rebase
var
This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)