-
-
Save anilex/1220397 to your computer and use it in GitHub Desktop.
This file contains 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
| ~/Sites/fortaleza[master]$ git checkout vcgames-list-all-games-page | |
| error: Untracked working tree file 'public/flash/games/vcgames/PinBall/PinBallLogo.swf' would be overwritten by merge. | |
| ~/Sites/fortaleza[master]$ rm public/flash/games/vcgames/PinBall/PinBallLogo.swf | |
| ~/Sites/fortaleza[master*]$ git checkout vcgames-list-all-games-page | |
| Switched to branch 'vcgames-list-all-games-page' | |
| ~/Sites/fortaleza[vcgames-list-all-games-page]$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| error: Untracked working tree file 'public/flash/games/vcgames/PinBall/PinballLogo.swf' would be overwritten by merge. | |
| could not detach HEAD | |
| ~/Sites/fortaleza[vcgames-list-all-games-page]$ mv public/flash/games/vcgames/PinBall/PinBallLogo.swf public/flash/games/vcgames/PinBall/PinballLogo.swf | |
| ~/Sites/fortaleza[vcgames-list-all-games-page*]$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| error: Untracked working tree file 'public/flash/games/vcgames/PinBall/PinballLogo.swf' would be overwritten by merge. | |
| could not detach HEAD | |
| ~/Sites/fortaleza[vcgames-list-all-games-page*]$ rm public/flash/games/vcgames/PinBall/PinBallLogo.swf | |
| ~/Sites/fortaleza[vcgames-list-all-games-page*]$ git rebase master | |
| public/flash/games/vcgames/PinBall/PinBallLogo.swf: needs update | |
| cannot rebase: you have unstaged changes | |
| ~/Sites/fortaleza[vcgames-list-all-games-page*]$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment