summaryrefslogtreecommitdiff
path: root/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn
diff options
context:
space:
mode:
authorJoey Hess2019-07-01 12:14:55 -0400
committerJoey Hess2019-07-01 12:14:55 -0400
commit9e372de7d5dda142a73aa8d14263136dfd6a9fe3 (patch)
tree0c9cf3a5eab205b55826e2505a0f0eedbdff653d /doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn
parent394267002a8e63e52035919e4b35ee43cc940019 (diff)
parentccb2c08c1537766338755e4bf97a7d15c2162ef3 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn')
-rw-r--r--doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn21
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn
new file mode 100644
index 00000000..50578473
--- /dev/null
+++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn
@@ -0,0 +1,21 @@
+When there were upstream changes available, propellor used to prompt me to
+merge upstream changes into my local propellor repo with:
+
+ git merge upstream/master
+
+Of late, propellor has not been prompting me to merge upstream changes and
+my local propellor repo is stuck at ~version 5.3.5
+
+Is there is (another manual) way to merge upstream changes into my local propellor
+repo?
+
+My propellor repo is at
+
+ git clone git://git.ricketyspace.net/propellor.git
+
+Note that I've have some minor updates under the `src/` directory. [Some][0] [of][1] [them][2] were
+merged into upstream.
+
+[0]: https://propellor.branchable.com/forum/DNS_-_Support_for_Multiline_TXT_records/
+[1]: https://propellor.branchable.com/forum/Make_clean_fails_in_openbsd/
+[2]: https://propellor.branchable.com/forum/__96__Propellor.Bootstrap.cabalBuild__96___fails_in_openbsd/