Resolve-Merge(Pull)-Request-Conflict 📅 0001-01-01 · ☕ 1 min read Resolve Github/GitLab's merge(pull) request conflict.