search

abentley / oaf

A Git client that brings a more user-friendly CLI to Git.
Apache License 2.0
9 stars 1 forks source link

disconnect-branch should change where merges come from #65

Open abentley-ssimwave opened 1 year ago

abentley-ssimwave commented 1 year ago

I think the right solution here is

  1. switch-new -c should copy the current branch's merge target to the new branch
  2. merge et. al. should use the pipeline-previous branch by default That way, when the previous branch is removed, you start merging from that branch was merging from-- either its remembered branch or its pipeline-previous branch
abentley-ssimwave commented 1 year ago

A simpler option would be to just update the remembered branch to match the disconnected branch's remembered branch.

Also, the disconnected branch, itself, should maybe switch to merging from elsewhere?