Created
December 30, 2013 19:23
-
-
Save blackwatertepes/8186711 to your computer and use it in GitHub Desktop.
Git Strangeness
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
| [preproduction][~] git log | |
| commit 61cec4a71dbea09af2b4c8072216adfa2d8bcc4c | |
| Author: Tyler J. Kuhn <[email protected]> | |
| Date: Fri Dec 6 11:51:09 2013 -0800 | |
| if notes have no body, they get deleted | |
| [preproduction][~] git status | |
| # On branch preproduction | |
| nothing to commit, working directory clean | |
| [preproduction][~] git pull --rebase origin preproduction | |
| From github.com:Spongecell/Spongecell-Platform | |
| * branch preproduction -> FETCH_HEAD | |
| First, rewinding head to replay your work on top of it... | |
| [preproduction][~] git status | |
| # On branch preproduction | |
| # Your branch and 'origin/preproduction' have diverged, | |
| # and have 444 and 34 different commits each, respectively. | |
| # (use "git pull" to merge the remote branch into yours) | |
| # | |
| nothing to commit, working directory clean |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I don't see the Fri Dec 6 commit on my preproduction branch.
Maybe you have a commit or two on your branch that don't exist on the new preproduction branch, preventing the fast-forward.