API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 9th, 2015
217
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.43 KB | None | 0 0
raw download clone embed print report
  1. Last login: Fri Oct 9 10:53:06 on console
  2. You have new mail.
  3. Nigel-Purvess-MacBook-Pro:~ nigelpurves$ cd ~/Documents/Development/php-www.tickettext.co.uk/
  4. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git checkout develop
  5. Switched to branch 'develop'
  6. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git pull origin develop
  7. remote: Counting objects: 125, done.
  8. remote: Compressing objects: 100% (120/120), done.
  9. remote: Total 125 (delta 69), reused 0 (delta 0), pack-reused 0
  10. Receiving objects: 100% (125/125), 306.11 KiB | 0 bytes/s, done.
  11. Resolving deltas: 100% (69/69), done.
  12. From github.com:ticket-text/php-www.tickettext.co.uk
  13. * branch develop -> FETCH_HEAD
  14. 0a8e932..2e5fa5b develop -> origin/develop
  15. Updating 0a8e932..2e5fa5b
  16. Fast-forward
  17. admin/bookings/config.php | 8 ++++----
  18. admin/bookings/views/scripts/booking_bottom_section.phtml | 1 +
  19. admin/bookings/views/scripts/booking_view.phtml | 1 +
  20. admin/events/config.php | 15 ++++++++++-----
  21. admin/events/views/scripts/booking_slots_for_event.phtml | 2 +-
  22. assets/css/master.css | 2 +-
  23. assets/css/master.scss | 14 ++++++++++++++
  24. assets/js/consistent.js | 29 ++++++++++++++++++++++++-----
  25. assets/js/consistent.min.js | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
  26. objects.php | 7 +++++++
  27. promoter/ballots/config.php | 4 ++--
  28. promoter/bookings/config.php | 8 ++++----
  29. promoter/bookings/venues/config.php | 4 ++--
  30. promoter/bookings/venues/views/scripts/booking_bottom_section.phtml | 1 +
  31. promoter/bookings/venues/views/scripts/booking_view.phtml | 1 +
  32. promoter/bookings/views/scripts/booking_bottom_section.phtml | 1 +
  33. promoter/bookings/views/scripts/booking_view.phtml | 1 +
  34. promoter/events/config.php | 20 +++++++++++++-------
  35. promoter/events/views/scripts/booking_slots_for_event.phtml | 2 +-
  36. 19 files changed, 141 insertions(+), 83 deletions(-)
  37. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release start 20151009r1
  38. Switched to a new branch 'release/20151009r1'
  39.  
  40. Summary of actions:
  41. - A new branch 'release/20151009r1' was created, based on 'develop'
  42. - You are now on branch 'release/20151009r1'
  43.  
  44. Follow-up actions:
  45. - Bump the version number now!
  46. - Start committing last-minute fixes in preparing your release
  47. - When done, run:
  48.  
  49. git flow release finish '20151009r1'
  50.  
  51. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release finish 20151009r1
  52. Switched to branch 'master'
  53. Your branch is up-to-date with 'origin/master'.
  54. Merge made by the 'recursive' strategy.
  55. admin/bookings/config.php | 8 ++++----
  56. admin/bookings/views/scripts/booking_bottom_section.phtml | 1 +
  57. admin/bookings/views/scripts/booking_view.phtml | 1 +
  58. admin/events/config.php | 15 ++++++++++-----
  59. admin/events/views/scripts/booking_slots_for_event.phtml | 2 +-
  60. assets/css/master.css | 2 +-
  61. assets/css/master.scss | 14 ++++++++++++++
  62. assets/js/consistent.js | 29 ++++++++++++++++++++++++-----
  63. assets/js/consistent.min.js | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
  64. objects.php | 7 +++++++
  65. promoter/ballots/config.php | 4 ++--
  66. promoter/bookings/config.php | 8 ++++----
  67. promoter/bookings/venues/config.php | 4 ++--
  68. promoter/bookings/venues/views/scripts/booking_bottom_section.phtml | 1 +
  69. promoter/bookings/venues/views/scripts/booking_view.phtml | 1 +
  70. promoter/bookings/views/scripts/booking_bottom_section.phtml | 1 +
  71. promoter/bookings/views/scripts/booking_view.phtml | 1 +
  72. promoter/events/config.php | 20 +++++++++++++-------
  73. promoter/events/views/scripts/booking_slots_for_event.phtml | 2 +-
  74. 19 files changed, 141 insertions(+), 83 deletions(-)
  75. fatal: no tag message?
  76. Tagging failed. Please run finish again to retry.
  77. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git push origin master
  78. Counting objects: 1, done.
  79. Writing objects: 100% (1/1), 265 bytes | 0 bytes/s, done.
  80. Total 1 (delta 0), reused 0 (delta 0)
  81. To git@github.com:ticket-text/php-www.tickettext.co.uk.git
  82. 6be72e9..0b81a42 master -> master
  83. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git checkout develop
  84. Switched to branch 'develop'
  85. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git pull origin develop
  86. remote: Counting objects: 5, done.
  87. remote: Compressing objects: 100% (5/5), done.
  88. remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0
  89. Unpacking objects: 100% (5/5), done.
  90. From github.com:ticket-text/php-www.tickettext.co.uk
  91. * branch develop -> FETCH_HEAD
  92. 2e5fa5b..8efde4f develop -> origin/develop
  93. Updating 2e5fa5b..8efde4f
  94. Fast-forward
  95. promoter/ballots/config.php | 4 ++--
  96. 1 file changed, 2 insertions(+), 2 deletions(-)
  97. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release start 20151009r2
  98. There is an existing release branch (20151009r1). Finish that one first.
  99. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release finish 20151009r1
  100. Deleted branch release/20151009r1 (was 2e5fa5b).
  101.  
  102. Summary of actions:
  103. - Latest objects have been fetched from 'origin'
  104. - Release branch has been merged into 'master'
  105. - The release was tagged '20151009r1'
  106. - Release branch has been back-merged into 'develop'
  107. - Release branch 'release/20151009r1' has been deleted
  108.  
  109. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git pull origin develop
  110. From github.com:ticket-text/php-www.tickettext.co.uk
  111. * branch develop -> FETCH_HEAD
  112. Already up-to-date.
  113. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release start 20151009r2
  114. Tag '20151009r2' already exists. Pick another name.
  115. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git flow release finish 20151009r2
  116. Branch 'release/20151009r2' does not exist and is required.
  117. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git status
  118. On branch develop
  119. Untracked files:
  120. (use "git add <file>..." to include in what will be committed)
  121.  
  122. "\\"
  123.  
  124. nothing added to commit but untracked files present (use "git add" to track)
  125. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$ git push origin master
  126. Everything up-to-date
  127. Nigel-Purvess-MacBook-Pro:php-www.tickettext.co.uk nigelpurves$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!