I guess I have tried almost all of the solutions available on StackOverflow but could not have my problem solved at all. So maybe someone can help me with this one.
I have a branch that needs to be rebased onto master since there is a change in master. Basically, one of the header files has been deleted and some of its contents moved to another unit (split between a new header/spurce file). The job seems pretty clean – just rebase my branch onto remote master: