Bringing a stacked proposal up to date: rebase into the working copy, bookmark set --upto issue #42 closed: completed andymccall opened this 1 month ago · 0 comments

Feedback item 27 (metalgear). After a landing, stacked proposals read 'landing would carry conflicts' with no next step. (1) oxy rebase CHANGE --onto develop refuses when the result would be conflicted, with no way to take the conflict into the working copy; offer that (as merge already does, which worked well). (2) oxy bookmark set NAME CHANGE silently narrows to the change's closure (dropped the Flow pipeline changes, then the push was not a fast-forward); give it --upto/--only and ask, as bookmark create now does. (3) The hub's proposal conflict line should name the command that resolves it (merge the target in).