Git Merge Two Branches Locally