Git Command Merge Master Into Branch