Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- anddam@bibook /opt/macports/ports-git origin/master $ git checkout master
- Checking out files: 100% (9699/9699), done.
- Previous HEAD position was fedca06... p5-ref-util: update to version 0.113
- Switched to branch 'master'
- Your branch and 'origin/master' have diverged,
- and have 13 and 747 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- anddam@bibook /opt/macports/ports-git master [1]$ git branch
- * master
- wip
- anddam@bibook /opt/macports/ports-git master $ git pull --rebase --autostash
- First, rewinding head to replay your work on top of it...
- Applying: py-click: add python 3.6 support.
- Using index info to reconstruct a base tree...
- M python/py-click/Portfile
- Falling back to patching base and 3-way merge...
- No changes -- Patch already applied.
- Applying: py-crypto: add python 3.6 support.
- Using index info to reconstruct a base tree...
- M python/py-crypto/Portfile
- Falling back to patching base and 3-way merge...
- No changes -- Patch already applied.
- Applying: py-pygments: add python 3.6 support.
- Using index info to reconstruct a base tree...
- M python/py-pygments/Portfile
- Falling back to patching base and 3-way merge...
- No changes -- Patch already applied.
- Applying: py-sqlparse: add python 3.6 support.
- Using index info to reconstruct a base tree...
- M python/py-sqlparse/Portfile
- Falling back to patching base and 3-way merge...
- [KILLED THE REBASE WITH ctrl-C]
- anddam@bibook /opt/macports/ports-git (null) $ git status
- rebase in progress; onto (null)
- You are currently rebasing.
- (all conflicts fixed: run "git rebase --continue")
- nothing to commit, working tree clean
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement