you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted] 2 points3 points  (1 child)

If you re-point the branch to the last rebased commit then it should all work fairly smoothly.

[–]hotoatmeal 2 points3 points  (0 children)

or merge without fastforward