This will save all local modifications and revert the working directory to match the HEAD commit: $ git stash Saved working directory and index state WIP on staging: e3c11da Changes date Alternatively, you can use git stash if you want to call the command without further arguments. To record the current state of your work including the Git index, simply type git stash push. So, let’s solve this and stash the local changes. The above error message tells you that the file agency.css has been modified locally and that, at the same time, the branch you’re trying to merge in also contains changes in that file - a typical merge conflict. Git is clever, so it sometimes tells you to clean up and suggests that you stash your changes: error: Your local changes to the following files would be overwritten by merge: css/agency.css Please commit your changes or stash them before you merge.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |