git ubuntu merge UX improvements
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
Triaged
|
Undecided
|
Nish Aravamudan |
Bug Description
Fleshing the idea out a bit more.
`git ubuntu merge start` saves parameters to .git/GIT_
`git ubuntu merge [!start]` uses values from .git/GIT_
`git ubuntu merge --continue` is used to iterate through our workflow steps by storing the current step in .git/GIT_
`git ubuntu merge finish` deletes .git/GIT_
`git ubuntu merge [--quit|--abort]` added to stop at any given step and to reset back to the original state respectively.
Original description:
1) commitish=HEAD by default
2) save parameters to `git ubuntu merge start` into .git, update git_ps1
3) `git ubuntu merge finish` without parameters should use that file, if available, allowing user to override.
4) provide `git ubuntu merge abort` to break out of state, meaning we need to save original commitish (or ensure we do everything without changing working tree)
description: | updated |
summary: |
- git ubuntu merge start UX improvements + git ubuntu merge UX improvements |
Changed in usd-importer: | |
milestone: | none → 1.0 |
status: | New → Triaged |
Changed in usd-importer: | |
milestone: | 1.0 → future |
tags: | added: merge |
description: | updated |
@Christian, @Andreas, what do you think of my suggested changes? Given our new code, I think we would be able to use a temporary worktree (chdir'd to it after start) for doing the merge and finish would put you back where you started, at the update-maitainer commit (similar to what we do now, but everything is done in the worktree) and the worktree is pruned.
Or, if you abort, the worktree is simply pruned and you are put back in our old directory.