New Paste

 

Recent Pastes

Administrate




Pastebin on paste.luisaranguren.com

PasteID: 6rf
Pasted by Anonymous, 2020-03-18 21:20:39 GMT
Expires Never
Paste size 3.78 Kb
Tools Raw   Download
 
 
  1.  pizzaman   master  ~  git  bisq  git remote add upstream https://github.com/bisq-network/bisq.git
  2.  pizzaman   master  ~  git  bisq  git remote -v
  3. origin	https://mercurytoxic@github.com/mercurytoxic/bisq.git (fetch)
  4. origin	https://mercurytoxic@github.com/mercurytoxic/bisq.git (push)
  5. upstream	https://github.com/bisq-network/bisq.git (fetch)
  6. upstream	https://github.com/bisq-network/bisq.git (push)
  7.  pizzaman   master  ~  git  bisq  git fetch upstream 
  8. remote: Enumerating objects: 38, done.
  9. remote: Counting objects: 100% (38/38), done.
  10. remote: Compressing objects: 100% (20/20), done.
  11. remote: Total 43 (delta 15), reused 20 (delta 12), pack-reused 5
  12. Unpacking objects: 100% (43/43), 8.51 KiB | 968.00 KiB/s, done.
  13. From https://github.com/bisq-network/bisq
  14.  * [new branch]          http-api           -> upstream/http-api
  15.  * [new branch]          master             -> upstream/master
  16.  * [new branch]          new-trade-protocol -> upstream/new-trade-protocol
  17.  * [new branch]          purge-failed       -> upstream/purge-failed
  18.  * [new branch]          release/v1.2.5     -> upstream/release/v1.2.5
  19.  * [new branch]          release/v1.2.6     -> upstream/release/v1.2.6
  20.  * [new branch]          release/v1.2.7     -> upstream/release/v1.2.7
  21.  * [new branch]          release/v1.2.8     -> upstream/release/v1.2.8
  22.  * [new branch]          release/v1.2.9     -> upstream/release/v1.2.9
  23.  * [new branch]          revert-3758-master -> upstream/revert-3758-master
  24.  * [new tag]             v1.2.9             -> v1.2.9
  25.  pizzaman   master  ~  git  bisq  git checkout master 
  26. Already on 'master'
  27. Your branch is up to date with 'origin/master'.
  28.  pizzaman   master  ~  git  bisq  git merge upstream/master 
  29. Updating fdc17e90e..89cfb34b8
  30. Fast-forward
  31.  desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java | 23 ++++++++++++++++-------
  32.  desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java       | 19 +++++++++++++++++--
  33.  2 files changed, 33 insertions(+), 9 deletions(-)
  34.  pizzaman   master  ~  git  bisq  tig
  35.  pizzaman   master  ~  git  bisq  git checkout Australian_PayID 
  36. Switched to branch 'Australian_PayID'
  37.  pizzaman   Australian_PayID  ~  git  bisq  git pull --rebase
  38. First, rewinding head to replay your work on top of it...
  39. Generating patches: 100% (1577/1577), done.
  40. Applying: Add testnet seeds
  41. Applying: Add null checks
  42. Applying: Add null check
  43. Applying: Update BTC_DONATION_ADDRESS_OWNER bond
  44. Applying: Added mining fee to un/lock bond popup.
  45. Applying: Complete pull request
  46. Applying: Fix incorrect display string name inputTooToBeAtLeast
  47. Applying: Fix incorrect value stated in error message and use inputToBeAtLeast
  48. Applying: Fix get all bonds not returning not active bonds
  49. Applying: Disallow proposing to confiscate inactive bonds
  50. Applying: Complete pull request
  51. Applying: Set max buyer's security deposit to 20% instead of 10%
  52. Applying: rename XDR ticker (conflict with ISO 4217)
  53. Applying: Update Netlayer to 0.6.5
  54. Using index info to reconstruct a base tree...
  55. M	build.gradle
  56. M	gradle/witness/gradle-witness.gradle
  57. Falling back to patching base and 3-way merge...
  58. Auto-merging gradle/witness/gradle-witness.gradle
  59. CONFLICT (content): Merge conflict in gradle/witness/gradle-witness.gradle
  60. Auto-merging build.gradle
  61. error: Failed to merge in the changes.
  62. Patch failed at 0014 Update Netlayer to 0.6.5
  63. hint: Use 'git am --show-current-patch' to see the failed patch
  64. Resolve all conflicts manually, mark them as resolved with
  65. "git add/rm <conflicted_files>", then run "git rebase --continue".
  66. You can instead skip this commit: run "git rebase --skip".
  67. To abort and get back to the state before "git rebase", run "git rebase --abort".
  68.  pizzaman   164ff2a  ~  git  bisq  1  
  69.  
 
 
 
 
 
Written by Xan Manning, 2010.