Git Merge Force Merge Commit