git-machete-intellij-plugin icon indicating copy to clipboard operation
git-machete-intellij-plugin copied to clipboard

Relocate branches

Open CLOVIS-AI opened this issue 2 years ago • 2 comments
trafficstars

Feature description

Git Machete shines with the "rebase to edit the current branch" workflow, but I think it could be better with the "rebase to change the base of a branch" workflow.

Examples:

  • Move up the hierarchy (becomes its parent's sibling): rebase from the base of the parent branch, drop all commits which are in the parent but not the child
  • Move down the hierarchy (becomes its sibling's child): rebase from the base of the branch onto the new child

Both of these are easily doable today for users who understand Git well (edit the .machete file manually then use Machete to rebase and drop what shouldn't be there), but I think they could be made easier to use? Maybe by drag-and-drop'ing in the tool window?

CLOVIS-AI avatar Mar 13 '23 13:03 CLOVIS-AI

This idea has almost 3 years already (https://github.com/VirtusLab/git-machete-intellij-plugin/issues/231) 😅

I agree that it would be very handy to be able to drag & drop the branches and more convenient than the machete file edition. 👍

As you can see in the original issue we had decided to drop this idea as

  • there is the mentioned workaround with editing the machete file 🔧
  • it seems to be complicated - drag&drop handling indentions, multiple separate root branches, looking and working nice, developed by programmers by engineers with backend experience only 😅

However, as this time the issue has been brought up from outside (by you!) we surely reconsider it 🙂

mkondratek avatar Mar 13 '23 15:03 mkondratek

Ahah, I understand your points. You're right, the workaround is easy (at least for developers who understand Git well). Feel free to close this as duplicate if you want to.

CLOVIS-AI avatar Mar 14 '23 09:03 CLOVIS-AI