ParentFull threadZacharias030·Anything that rebases cleanly is rebased and anything else is marked for needing a manual resolution.View on HN