playcanvas / playcanvas/editor
Can't selectively select changes in template assets in merge
Open
Nobody has claimed this yet.
🔥🔥
area: templates
area: version control
enhancement
- Dominant language
- TypeScript
- Stars
- 1.3k
- Forks
- 215
- Avg merge
- 1d 29m
- Merged PRs (30d)
- 30
Description
If changes have been made on both branches to a template asset in a merge, the tool sees that as a conflict and requires you to choose one or the other.
Can we merge selectively like it does with scenes?
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 by reproducing a merge where both branches change the same template asset, then compare the existing selective merge behavior for scenes. Done means template assets can be merged selectively instead of forcing an all-or-nothing choice.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- typescript
- Domain
- frontend
- Issue type
- Feature
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 35/100