1

I'm volunteering to develop SciDAVis, an open source application for scientific data analysis and visualization. Recently, I've found that there is a fork, AlphaPlot, that diverged in 2016. Using rev-list (see this answer) I found that AlphaPlot contains 398 commits to merge-base, SciDAVis contains 939 commits. Nasty.
I would like to reintegrate selected commits from AlphaPlot/master to SciDAVis and, if possible, to create a new merge base to simplify further reintegration. There were many renames/moves of files in Alphaplot, which is quite unpleasant for merging. I found first, second, third, fourth, fifth and sixth questions concerning the matter. Looks like I'm to use either cherry-pick, merge -X rename-threshold=25 or rebase --interactive. The cherry-pick variant tells me "to set merge.renamelimit to at least 1726" and fails. Also it would not create new merge-base. merge variant also fails with "set merge.renamelimit to at least 1726", and --no-ff does not help. Of course, rebase --interactive --strategy-option="rename-threshold=XX" will work to some extent, but as I understand there will be no new merge-base.
I'm okay with manual resolving of conflicts, but I'd like to avoid unnecessary work to complete merge in my lifetime. Is there any sane way to achieve merging of selected commits only and creating a new common commit as a merge-base? Thank you very much.

Suthiro
  • 1,210
  • 1
  • 7
  • 18
  • 1
    What is merged is a commit, not a branch. No law says to merge the branch commit. You could merge the third commit from the merge base. It might go well. Then the third commit after that. And so on. Just an idea... – matt May 17 '21 at 07:54
  • 1
    Taking @matt's idea a few steps further results in [git-imerge](https://github.com/mhagger/git-imerge). – torek May 17 '21 at 18:14
  • @matt it is essentially the same as rebasing, isn't it? – Suthiro May 17 '21 at 18:51
  • @torek looks interesting, thanks! – Suthiro May 17 '21 at 18:51
  • @Suthiro I don’t see how it is in any way like rebasing. – matt May 19 '21 at 09:09

0 Answers0