I did a hybrid approach - did reset to HEAD~4 so the branch contained only the tag filter feature without any conflicts, then rebased it on top of master, and then re-wrote the last 4 patches manually - it was simpler than rebasing the whole branch.


Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.Message ID: <geany/geany/pull/3055/c1012238886@github.com>