![]() I don't understand even half of what this process is so I'm sure there is some simple setting or option that I've missed. I go to the changes list, select that file, and tell it to undo the changes. (remove the -dry-run option to actually delete the local branches) Delete the corresponding local branch as well git branch -d aBranch. ![]() The file it claims I changed is '.vs/sinx. If the branch has been deleted on the server side, try in command line (since such a 'button' doesn't seem to exist directly in Visual Studio): git remote prune origin -dry-run. First of all, this is BS because I have literally changed nothing on my travel computer. (Kind of dumb that I would have to do that but whatever.)īut I still get the same error when I try to pull. However when I went to pull the files on my travel computer, I get this error: Cannot pull because there are uncommited changes. I don't see the gitignore file on my travel computer so I copy it over manually. vs/ in that file so I guess it should ignore the. I have an ignore file that I copied from here since they were also working with Unity so I figure that also ignores the Unity files I don't want to override. (Just a guess, CMIIW) So my first thought is that this is probably a file that I'm supposed to ignore anyway since it's something internal to visual studio. If I do a git checkout on one of them, it pulls the branch down locally and swaps to it. git remote show origin shows me all branches. Right now (for some reason) running git branch shows me master and one other branch, that I am actively working on. The file it claims I changed is ".vs/sinx.sqlite" which I'm guessing is a file visual studio created and used since it is in the. After git pull Ive always been able to see all branches by doing a git branch. However when I went to pull the files on my travel computer, I get this error: Cannot pull because there are uncommited changes.įirst of all, this is BS because I have literally changed nothing on my travel computer. Next I made another push with a second batch of files. I've managed to get my first batch of files successfully pushed on my main computer and pulled onto my travel computer. I've got a project set up within Azure and I'm using the Git functionality within Visual Studio. If Remote-Container Extension is installed, enabled the branch is already set up with a devcontainer.json, a pop-up window will allow you to open the current branch in a container. Afterwards I can open the entire folder within vscode. If you want to fully reset to the remotes state, git reset -hard origin/ - but often and in this case, those two commits youre ahead of origin by are work you did, not something you want to throw away.git reset -hard affects the former, not the latter. I am just trying to use git so I can keep my files up-to-date between two computers. Ok, I guess it works, if I use the shell command shown below: git clone -branch . shailenTJ 'Local changes' here means uncommitted changes, not local commits.The problem is that switching to master or pulling everything directly into the live system would cause problems so I'd prefer to avoid this.I am very new to using gits and version control (and extremely frustrated by the lack of tutorials designed for people who don't already understand this stuff.)
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |