Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- andreea@crimson:~/Documents/2ndyrpaper/newREPO/HARK$ git pull --rebase
- First, rewinding head to replay your work on top of it...
- Applying: Add estimates of center and spread obtained for different countries on thinkpad
- Using index info to reconstruct a base tree...
- M cstwGrowth/wealthData_CN_1988.csv
- M cstwGrowth/wealthData_ES_1988.csv
- M cstwGrowth/wealthData_FR_1988.csv
- M cstwGrowth/wealthData_GB_1988.csv
- M cstwGrowth/wealthData_US_1988.csv
- .git/rebase-apply/patch:26: trailing whitespace.
- import sys
- .git/rebase-apply/patch:95: trailing whitespace.
- .git/rebase-apply/patch:97: trailing whitespace.
- #
- .git/rebase-apply/patch:159: trailing whitespace.
- center_estimate = 0.996761598185
- .git/rebase-apply/patch:160: trailing whitespace.
- spread_estimate = 2.29055640598e-06
- warning: squelched 43 whitespace errors
- warning: 48 lines add whitespace errors.
- Falling back to patching base and 3-way merge...
- Auto-merging cstwGrowth/wealthData_ES_1988.csv
- CONFLICT (content): Merge conflict in cstwGrowth/wealthData_ES_1988.csv
- error: Failed to merge in the changes.
- Patch failed at 0001 Add estimates of center and spread obtained for different countries on thinkpad
- The copy of the patch that failed is found in: .git/rebase-apply/patch
- When you have resolved this problem, run "git rebase --continue".
- If you prefer to skip this patch, run "git rebase --skip" instead.
- To check out the original branch and stop rebasing, run "git rebase --abort".
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement