I have made several commits to the MASTER (say A, B and C, where C is the latest). Then due to strange bug I have made a branch FIX from commit A and added commits D, E and F to the branch fix.
So now I have MASTER with A-B-C and FIX with A-D-E-F and I need to merge it all to MASTER removing commits B and C, so final MASTER should contain A-D-E-F. How can I achieve that?