Resolving merge conflicts for PRs opened before Oct' 4
Nobody has claimed this yet.
- Dominant language
- Python
- Stars
- 17.9k
- Forks
- 7.3k
- Avg merge
- 1d 15h
- Merged PRs (30d)
- 13
Description
After #4384 was merged on Oct' 4, we now use ufmt to format our code base and enforce this code style on every PR. In case you opened a PR before that, you will likely see merge conflicts popping up. Here is what you do:
$ git checkout main
$ git pull
$ git checkout $MY_FEATURE_BRANCH
$ git merge -X ours main
$ pre-commit run --all-files
$ git commit -am "fix code format"
$ git push
This should work for most cases. If you encounter any issues with that, feel free to ping @pmeier on your PR to help you fix it.
Contributor guide
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 issue provides Git commands for resolving formatting conflicts in existing pull requests, but names no repository file or test to change. Start by checking whether the guidance is still relevant after the current formatting workflow; done would require an identified documentation update or other concrete repository change.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, python
- Domain
- developer-experience, tooling
- Issue type
- Documentation
- Difficulty
- 1/5
- Estimated time
- Under an hour
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 20/100