Better push handling with multiple branches