Be able to test the branch during a merge resolution
@zachpeterpaul is already working on this.
Since Aug 10, 2021.
Assessment
This issue has not been assessed yet.
Description
At the moment, when it comes to merge resolution, the user can only not merge or do a complete merge.
There are some cases where perhaps they would like to test during a merge resolution and be able to make changes to the resolution without committing.
There are some workarounds to this where a user can merge from master to their working feature branch, resolve conflicts/merge issues and then merge back to master to ensure master is pristine.
- Dominant language
- TypeScript
- Stars
- 1.3k
- Forks
- 215
- Avg merge
- 1d 29m
- Merged PRs (30d)
- 30
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.
More from playcanvas/editor
-
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
playcanvas/editor#2245 ·
-
area: viewport enhancement
Difficulty 2/5 1-3 hours Newbie friendliness 70/100
playcanvas/editor#2223 ·
-
area: launch tab enhancement
Difficulty 2/5 1-3 hours Newbie friendliness 65/100
playcanvas/editor#2153 ·
-
Difficulty 3/5 1-2 days Newbie friendliness 72/100
playcanvas/editor#2254 ·
-
playcanvas/editor#2253 · 1 assignee ·
All issues in playcanvas/editor
Similar issues
-
clawsweeper:fix-shape-clear clawsweeper:queueable-fix clawsweeper:source-repro impact:ux-friction issue-rating: 🦞 diamond lobster no-stale P3
Difficulty 2/5 1-3 hours Newbie friendliness 78/100
-
community first-timers-only good first issue hacktoberfest help wanted low hanging fruit up-for-grabs
Difficulty 1/5 Under an hour Newbie friendliness 76/100
-
code-quality refactoring
Difficulty 2/5 1-3 hours Newbie friendliness 84/100
github/gh-aw-firewall#8816 ·
-
integration:quickjs org:external priority:backlog topic:code-interpreter topic:middleware type:feature
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
langchain-ai/deepagents#6450 ·
-
Difficulty 1/5 Under an hour Newbie friendliness 88/100
vercel/react-tweet#225 ·