selfteaching / selfteaching/selfteaching-python-camp
Day01 从公共仓库把master文件pull request到个人仓库出现的分支冲突
Open
Nobody has claimed this yet.
- Dominant language
- Python
- Stars
- 151
- Forks
- 875
- PR merge metrics
- No merged PRs in 30d
Description
出现错误：
This branch has conflicts that must be resolved
Use the command line to resolve conflicts before continuing.
且“Merge pull request”是灰色的。
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
The report contains only a screenshot and the GitHub message “This branch has conflicts that must be resolved.” Start by checking the pull request’s branch relationship with master and reproduce the conflict if possible. Done means the conflict is resolved and the “Merge pull request” action is enabled.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, python
- Domain
- devops
- Issue type
- Bug
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100