daily pastebin goal
8%
SHARE
TWEET

Untitled

a guest Jun 13th, 2018 436 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. andreea@crimson:~/Documents/2ndyrpaper/newREPO/HARK$ git pull --rebase
  2. First, rewinding head to replay your work on top of it...
  3. Applying: Add estimates of center and spread obtained for different countries on thinkpad
  4. Using index info to reconstruct a base tree...
  5. M   cstwGrowth/wealthData_CN_1988.csv
  6. M   cstwGrowth/wealthData_ES_1988.csv
  7. M   cstwGrowth/wealthData_FR_1988.csv
  8. M   cstwGrowth/wealthData_GB_1988.csv
  9. M   cstwGrowth/wealthData_US_1988.csv
  10. .git/rebase-apply/patch:26: trailing whitespace.
  11. import sys
  12. .git/rebase-apply/patch:95: trailing whitespace.
  13.            
  14. .git/rebase-apply/patch:97: trailing whitespace.
  15. #            
  16. .git/rebase-apply/patch:159: trailing whitespace.
  17. center_estimate = 0.996761598185                    
  18. .git/rebase-apply/patch:160: trailing whitespace.
  19. spread_estimate = 2.29055640598e-06                    
  20. warning: squelched 43 whitespace errors
  21. warning: 48 lines add whitespace errors.
  22. Falling back to patching base and 3-way merge...
  23. Auto-merging cstwGrowth/wealthData_ES_1988.csv
  24. CONFLICT (content): Merge conflict in cstwGrowth/wealthData_ES_1988.csv
  25. error: Failed to merge in the changes.
  26. Patch failed at 0001 Add estimates of center and spread obtained for different countries on thinkpad
  27. The copy of the patch that failed is found in: .git/rebase-apply/patch
  28.  
  29. When you have resolved this problem, run "git rebase --continue".
  30. If you prefer to skip this patch, run "git rebase --skip" instead.
  31. To check out the original branch and stop rebasing, run "git rebase --abort".
RAW Paste Data
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
 
Top