Re-sync after history rewrite (extracted one commit from one branch to another)

Re-sync after history rewrite (extracted one commit from one branch to another)