forcedotcom / forcedotcom/devops-center-roadmap
GitHub erroneously identifying merge conflicts with Profile changes
Open
- Dominant language
- No language data
- Stars
- 27
- Forks
- 1
- PR merge metrics
- No merged PRs in 30d
Description
GitHub identified merge conflicts and is blocking promotion after committing Profiles metadata. The code in each profile-meta.xml file is the same on both sides of the conflict. Code inside of the identified conflicts looks like this:
Result is that I have to make 150+ clicks to resolve each error in GitHub. Is this intended behavior?
Contributor guide
Assessment
This issue has not been assessed yet.