selfteaching / selfteaching/selfteaching-python-camp
Day03 提交pull request出现冲突
Open
Nobody has claimed this yet.
question
- Dominant language
- Python
- Stars
- 151
- Forks
- 875
- PR merge metrics
- No merged PRs in 30d
Description
在git push 了本地文件后，发起了一个 pull request 但是出现以下提示，有冲突。
我查看后，确实在远程仓库里面readme文件没有内容（下图）
而我在本地的readme已经添加了内容。但是我明明已经在修改readme之后进行了 git add . ; git commit ;git push 操作。并且我重新进行提交后，依然有冲突提示。
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
Start by comparing the README mentioned in the local branch with the remote branch and inspect the pull request's conflict state. Review the branch history after the reported git add, commit, and push commands; done means the pull request no longer reports a README conflict.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git
- Domain
- cli
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100