Rebasing Issue With Ceph Master

hello everyone, I have a branch which I m rebasing with my master, but during rebasing I seem to loose data I manually resolved all the commits, after that when I building the build is failing, the main problem I m facing in `rgw_sal.h` and in `rgw_common.h` where the error is "req_state doesnt have a bucket_info" , and in some places I saw bucket_info being replaced by s->bucket->get_info(). This is what I m not understanding, some changes are merged successfully, but some are ignored why is this happening? My branch - https://github.com/suab321321/ceph/tree/wip-jaegerTracer