From b1c8aa980dd81be8c56ca5bcb0d1c5ea1ef69d8e Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Wed, 29 May 2019 12:43:01 +0000 Subject: New post about merging upstream changes. --- ...stream_changes_into_my_local_propellor_repo.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo.mdwn') 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/ -- cgit v1.2.3