gistfile1.txt

error: could not apply dd1b7e7... fixup! Rename WinForms main form, et. al.

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".

Recorded preimage for 'fmcollect/fmcollect.csproj'

Could not apply dd1b7e7a4c328fa13927a0619432f225484ac775... fixup! Rename WinForms main form, et. al.

Here is my current combined git configuration as reported by git config -l:

alias.alog=log --all --graph
alias.amend=commit --amend --no-edit
alias.fall=fetch --all
alias.ff=merge --ff --ff-only
alias.fixup=commit --fixup
alias.squash=commit --squash
alias.staged=diff --cached
alias.start=checkout -tb
core.filemode=false
core.autocrlf=input
log.decorate=short
merge.ff=false
merge.log=100
push.default=tracking
rebase.autosquash=true
rerere.enabled=true
user.name=Brandon McCaig
user.email=bamccaig@gmail.com
color.diff=auto
color.grep=auto
pretty.subject=format:%s
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
remote.local.url=/var/lib/git/mcollect.git
remote.local.fetch=+refs/heads/:refs/remotes/local/
remote.origin.url=/b/var/lib/git/mcollect.git
remote.origin.fetch=+refs/heads/:refs/remotes/origin/
branch.master.remote=origin
branch.master.merge=refs/heads/master
remote.backup.url=/b/var/lib/git/mcollect-backup.git
remote.backup.fetch=+refs/heads/:refs/remotes/backup/
branch.winforms.remote=origin
branch.winforms.merge=refs/heads/master
branch.wpf.remote=origin
branch.wpf.merge=refs/heads/wpf