Rebase without changing content
Is there a simple option to git rebase that says: "Rewrite this history,
automatically resolving all conflicts in such a way that the content of
HEAD after the rebase will remain the same as it is now"?
I have a feature branch and I have merged in master; essentially I'd like
to redo that as a rebase onto master.
I thought that -X ours might be that option, but the result was different
content.
No comments:
Post a Comment