Created
September 28, 2015 02:41
-
-
Save UnnDunn/c19dcf143731fffa49f8 to your computer and use it in GitHub Desktop.
git troubleshooting
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
D:\UnnDunn.Developer\Xamarin\Learn\MvvmCross-NPlus1>git status | |
On branch master | |
Your branch is ahead of 'origin/master' by 2 commits. | |
(use "git push" to publish your local commits) | |
Changes not staged for commit: | |
(use "git add <file>..." to update what will be committed) | |
(use "git checkout -- <file>..." to discard changes in working directory) | |
modified: N-06-Books/Books.Droid/Resources/Resource.Designer.cs | |
no changes added to commit (use "git add" and/or "git commit -a") | |
D:\UnnDunn.Developer\Xamarin\Learn\MvvmCross-NPlus1>git rm N-06-Books\Books.Droid\Resources\Resource.Designer.cs | |
error: the following file has local modifications: | |
N-06-Books/Books.Droid/Resources/Resource.Designer.cs | |
(use --cached to keep the file, or -f to force removal) | |
D:\UnnDunn.Developer\Xamarin\Learn\MvvmCross-NPlus1>git rm -f N-06-Books\Books.Droid\Resources\Resource.Designer.cs | |
rm 'N-06-Books/Books.Droid/Resources/Resource.Designer.cs' | |
D:\UnnDunn.Developer\Xamarin\Learn\MvvmCross-NPlus1>git status | |
On branch master | |
Your branch is ahead of 'origin/master' by 2 commits. | |
(use "git push" to publish your local commits) | |
Changes to be committed: | |
(use "git reset HEAD <file>..." to unstage) | |
deleted: N-06-Books/Books.Droid/Resources/Resource.Designer.cs | |
Changes not staged for commit: | |
(use "git add/rm <file>..." to update what will be committed) | |
(use "git checkout -- <file>..." to discard changes in working directory) | |
deleted: N-06-Books/Books.Droid/Resources/Resource.designer.cs | |
D:\UnnDunn.Developer\Xamarin\Learn\MvvmCross-NPlus1> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment