summaryrefslogtreecommitdiff
path: root/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment
blob: 2b169a570b7b30f2293e2156a032edc2b3f44162 (plain)
1
2
3
4
5
6
7
8
[[!comment format=mdwn
 username="spwhitton"
 avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb"
 subject="comment 5"
 date="2019-06-05T15:08:02Z"
 content="""
You can pass `-X theirs --allow-unrelated-histories` or similar.
"""]]