From c4f893b9e73e5c50387349929baa224ff60c1434 Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Sun, 2 Jun 2019 01:10:43 +0000 Subject: Added a comment --- .../comment_2_3dcd6f95340abed0accfecda716fd1f6._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment new file mode 100644 index 00000000..d59d2ca9 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 2" + date="2019-06-02T01:10:43Z" + content=""" +[@spwhitton](https://propellor.branchable.com/user/spwhitton/), My current host machine is OpenBSD. So, I get propellor from `cabal`. + +Currently I've propellor 5.8.0 installed from cabal. + +My local propellor repo is itself is stuck at 5.3.5 (). + +I wanted to know if there was a way to manually merge upstream changes into my local propellor repo? + +"""]] -- cgit v1.2.3