Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
Relax-- it's not nearly as bad as all that. :grin: I often say that having
to rebase PRs a lot is good-- it means the project is lively and the code is
evolving.
For me, the trick (as almost always with git) was to remember that you are
making/managing/corralling _deltas_ (aka commits), not versions. A branch can
be thought of as a chain of deltas that starts somewhere and ends with a
specific commit. Rebasing means taking a chain of commits that ends one branch
and swapping what comes before it to be another branch. So in this case, you
would have swapped the prefix of your branch (which has all the commits in
master _except_ those that were in #335) for master itself. You would have had
to do exactly the same adjustments, but you would have ended up with a series
of commits that appeared (from the POV of seeing how deltas add up to change)
as though you had begun work after #335 merged, which makes for a cleaner
public history. Of course your commits always keep their metadata, so we will
always actually know when they occurred in clock time.
---
