I have this following scenario that keeps coming back:
git pull --rebase
, I get a conflictI always fix this by either aborting rebase and using pull --no-rebase, or by cherry-picking the commit before rebase from the reflog.
There must be a better way.
Is there a good workaround for this common buggy scenario?
Might be a bug with an older version of git. Upgrading to a newer stable version is always a good idea when trying to fix weird stuff happening in software.