Walkthrough for using cli merge to resolve conflicts
Open
Nobody has claimed this yet.
CLI
documentation
sync v2
- Dominant language
- TypeScript
- Stars
- 21
- Forks
- 23
- Avg merge
- 1d 22h
- Merged PRs (30d)
- 17
Description
- make sure we explain WHY there's a CLI merge
- walk through a simple merge and forc eupdate
- walkthrough a merge with conflict (two changes on one workflow)
Some of this may already be done, I just want to make sure the story is tight
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
Search the existing CLI merge documentation and related workflow examples first, since the issue notes that some material may already exist. Trace the simple merge, force update, and conflict scenarios, then tighten the explanation so it covers why CLI merge is used and walks through each case, including two changes to one workflow.
Written by the indexing model from the issue text.
Assessment
- Domain
- cli, documentation
- Issue type
- Documentation
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 68/100