playcanvas / playcanvas/editor
Add 'force merge' to the version control
Nobody has claimed this yet.
- Dominant language
- TypeScript
- Stars
- 1.3k
- Forks
- 215
- Avg merge
- 1d 29m
- Merged PRs (30d)
- 30
Description
Related thread: https://forum.playcanvas.com/t/under-investigation-force-merge-branches/22772
There are use cases where a team wants to keep a branch (because it's part of a workflow or are using a user branch workflow) and have it be in the same exact state as another branch as a new checkpoint.
In larger teams especially, it's easy for accidental changes to be made without knowing in a branch and would like to do a 'reset' so that it matches another branch (ie master).
Currently the way to do this is to make a new branch off master but that would end up having branches named Art1, Art2, Art3 which would be made each time they need to do this.
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
Start with the related forum thread, https://forum.playcanvas.com/t/under-investigation-force-merge-branches/22772, and review the editor's existing version-control flow. Done means a user can reset an existing branch to exactly match another branch while keeping the branch name and creating a new checkpoint.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- typescript
- Domain
- tooling
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 35/100