Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch?
For example, I want to rebase mybranch
mybranch