Handle the situation where the main branch is ahead of the other one
    
    In these case, we do not want to include in our diff the commits that are
    already in the main branch, so we remove them.
    (Most often that means we will end up with an empty diff)