From 23c5587e60cc1b3de6c74f94b0f924344ef93cec Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Thu, 6 Jun 2019 03:13:02 +0000 Subject: Added a comment --- ...ent_7_de411d55ffbd72c5a4182168dead6b29._comment | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment new file mode 100644 index 00000000..9f6afc6b --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment @@ -0,0 +1,46 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 7" + date="2019-06-06T03:13:02Z" + content=""" +Documenting it (in case there is another user who wishes to do the same): + +Add upstream repo and fetch tags: + +``` +$ cd ~/.propellor + +$ git remote add u git://propellor.branchable.com/propellor +$ git fetch u --tags +``` + +Look for the list releases: + +``` +$ git tag -l +0.1 +0.1.1 +0.1.2 +0.2.0 +0.2.1 +... +... +... +X.Y.Z +``` + +To merge release `X.Y.Z` into your master branch, do: + +``` +$ git merge -X theirs --allow-unrelated-histories X.Y.Z +``` + +Fix any conflicts and: + +``` +$ git commit +``` + +"""]] -- cgit v1.2.3