First, rewinding head to replay your work on top of it...
Applying: private coupon push
Using index info to reconstruct a base tree...
<stdin>:86: trailing whitespace.

<stdin>:169: trailing whitespace.
     *
<stdin>:205: trailing whitespace.

<stdin>:283: trailing whitespace.

<stdin>:292: trailing whitespace.

warning: squelched 6 whitespace errors
warning: 11 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging software/idl/BoxOffice/VendorManager.idl
Auto-merging software/Server/BoxOffice/Server/CorbaImpl/VendorManager.java
CONFLICT (content): Merge conflict in software/Server/BoxOffice/Server/CorbaImpl/VendorManager.java
Auto-merging software/BusinessObjects/BoxOffice/BusinessObjects/Vendor.java
Auto-merging software/BusinessObjects/BoxOffice/BusinessObjects/Customer.java
Failed to merge in the changes.
Patch failed at 0001 private coupon push

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".