carpentries-incubator / carpentries-incubator/python-intermediate-development
Current flow leads to merge conflicts in pull requests in section 4
Open
- Dominant language
- TeX
- Stars
- 63
- Forks
- 77
- Avg merge
- 20h 8m
- Merged PRs (30d)
- 3
Description
Currently, the flow leading up to section 4 results in merge conflicts when opening a pull request from `feature-std-dev` into `dev`, because in the meantime there have been changes in the `dev` branch.
I suggest to add a callout on merge conflicts and how to resolve them because they will one way or another arise for some participants.
Contributor guide
Assessment
This issue has not been assessed yet.