提交到Bitbucket中团队成员的远程存储库后删除的项目更改

Question

I am a new git user. i am working with my team in a laravel web application project. First i cloned the project in my local machine. then i made some changes. i have read and write access to the team repository in Bitbucket where there is a branch 'mybranch' beside master branch. i had to commit my changes to this mybranch. In order to commit to mybrance, i switched the branch by using

git checkout mybranch

then i got following message

error: Your local changes to the following files would be overwritten by checkou t: resources/views/aview.blade.php Please commit your changes or stash them before you switch branches. Aborting

then i used following command

git checkout -f mybranch

then i commited the files like following

git add .
git commit -m "my changes" 
git push origin mybranch

It committed my controller and view files of the project to mybranch of the repository of bitbucket, but other configuration files of the project were not committed. More importantly, when i switched to master branch and tried to access my codes in local machine, i found all my changes are disappeared. now i only have the project files which was cloned before from the repository. Can anyone tell me what went wrong here and how to recover my changes again ? Thank you so much in advance !

Answer 1

Your changes were committed to mybranch that's why they're not in the master branch. If you want those changes in your master branch, you can do git merge mybranch while you're in the master branch. Next time you encounter the error message that you posted, you can do git stash before you try to checkout the other branch. Then you can just run git stash pop afterwards.

Answer 2

When you did

git checkout -f mybranch

you told Git to force checkout mybranch , and to overwrite any local changes which would be overwritten in the process. It appears that you have nuked some of your work, and there may not be a fix.

Here is what you could have done to avoid this:

git stash               # stash your working directory
git checkout mybranch   # switch to mybranch
git stash apply         # now bring back your working directory
git commit -m '...'     # commit your work on your branch

For future reference, be wary of your working directory as it is quite possibly the most vulnerable data. It is relatively hard to mess up with commits, but the working folder is another story.

With regard to the master branch, you never committed this work on that branch, and hence you won't find the changes there.

Answer 3

Unfortunately, you can't recovery it back since you were not committed the changes on master and checkout to mybranch by default.

Before switching to other branches, the changes on the current branch should be committed. If you try to switch to another branch while the changes is not committed on the current branch, git will hint you (as you met):

 Your local changes to the following files would be overwritten by checkout 

But if you checkout to another branch by force ( git checkout -f ), git will discard the uncommitted changes on current branch.