31 ms·

Since the typo is inherited in commit3+, conflict is guaranteed after commit2 is amended, right? Is there a way to automate this? I do appreciate the clean comm

• fargle 4y ago
  No, if the lines around the change are stable, it should resolve itself. Assuming that after line commit3 was edited, the future changes occur further down in the file, (which is usual). At worst, it should be OK after a conflict or two. NOTE: also this is just a different way of performing the same thing as the other rebase suggestion. It's also the same as cherry-picking each newer commit manually. All methods will have the same amount of conflict resolution. UPDATE: I just constructed this exact scenario to test it and can confirm that if your sequence is exactly as described, you'll get one conflict commit #3 after you edit commit #2. After it's resolved, the other 98 commits are automatic.
  • pm2222 4y ago
    Great it works just as you describe. I notice that the commit hashes change except commit1. Would tag be stable with rebase operation and can be used in my case? Perhaps it's too much to ask git.