Advertisement
Guest User

Untitled

a guest
Jan 17th, 2017
227
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.62 KB | None | 0 0
  1. anddam@bibook /opt/macports/ports-git origin/master $ git checkout master
  2. Checking out files: 100% (9699/9699), done.
  3. Previous HEAD position was fedca06... p5-ref-util: update to version 0.113
  4. Switched to branch 'master'
  5. Your branch and 'origin/master' have diverged,
  6. and have 13 and 747 different commits each, respectively.
  7. (use "git pull" to merge the remote branch into yours)
  8.  
  9. anddam@bibook /opt/macports/ports-git master [1]$ git branch
  10. * master
  11. wip
  12.  
  13. anddam@bibook /opt/macports/ports-git master $ git pull --rebase --autostash
  14. First, rewinding head to replay your work on top of it...
  15. Applying: py-click: add python 3.6 support.
  16. Using index info to reconstruct a base tree...
  17. M python/py-click/Portfile
  18. Falling back to patching base and 3-way merge...
  19. No changes -- Patch already applied.
  20. Applying: py-crypto: add python 3.6 support.
  21. Using index info to reconstruct a base tree...
  22. M python/py-crypto/Portfile
  23. Falling back to patching base and 3-way merge...
  24. No changes -- Patch already applied.
  25. Applying: py-pygments: add python 3.6 support.
  26. Using index info to reconstruct a base tree...
  27. M python/py-pygments/Portfile
  28. Falling back to patching base and 3-way merge...
  29. No changes -- Patch already applied.
  30. Applying: py-sqlparse: add python 3.6 support.
  31. Using index info to reconstruct a base tree...
  32. M python/py-sqlparse/Portfile
  33. Falling back to patching base and 3-way merge...
  34.  
  35. [KILLED THE REBASE WITH ctrl-C]
  36.  
  37. anddam@bibook /opt/macports/ports-git (null) $ git status
  38. rebase in progress; onto (null)
  39. You are currently rebasing.
  40. (all conflicts fixed: run "git rebase --continue")
  41.  
  42. nothing to commit, working tree clean
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement