git rebase issue

[xauthulei]

I am try to commit a fix to this repo:

% git fetch upstream; git rebase upstream/master
fatal: It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr ".git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.

I an confuse to this, I am not sure if I could take the remove action for this

[xauthulei]

Before this, I met this error :

% git fetch upstream; git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: LICENSE file
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:182: trailing whitespace.
     
.git/rebase-apply/patch:183: trailing whitespace.
       END OF TERMS AND CONDITIONS
.git/rebase-apply/patch:184: trailing whitespace.

.git/rebase-apply/patch:185: trailing whitespace.
  APPENDIX: How to apply the Apache License to your work.
.git/rebase-apply/patch:186: trailing whitespace.

warning: squelched 21 whitespace errors
warning: 26 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in LICENSE
Auto-merging LICENSE
error: Failed to merge in the changes.
Patch failed at 0001 LICENSE file
hint: Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".