githubschool / githubschool/foundations-4-28-15
Pull requests and merge conflicts
Open
question
- Dominant language
- No language data
- Stars
- 23
- Forks
- 46
- PR merge metrics
- No merged PRs in 30d
Description
My organization currently requires developers to submit pull requests to have them reviewed by a small group of "gatekeepers". Once the pull request is finished and tested it is merged by the gatekeepers into our develop branch.
A problem we're having is that it's difficult for the gatekeepers to work through merge conflicts without taking the conversation out of the pull request. Is there a way to communicate diffs back and forth to work through merge conflicts in the pull request?
Contributor guide
No contributing guide indexed for this repository
Assessment
This issue has not been assessed yet.