propellor

propellor config for hosts.
git clone git://git.ricketyspace.net/propellor.git
Log | Files | Refs | LICENSE

merging_upstream_changes_into_my_local_propellor_repo.mdwn (849B)


      1 When there were upstream changes available, propellor used to prompt me to
      2 merge upstream changes into my local propellor repo with:
      3 
      4     git merge upstream/master
      5 
      6 Of late, propellor has not been prompting me to merge upstream changes and
      7 my local propellor repo is stuck at ~version 5.3.5
      8 
      9 Is there is (another manual) way to merge upstream changes into my local propellor
     10 repo?
     11 
     12 My propellor repo is at
     13 
     14     git clone git://git.ricketyspace.net/propellor.git
     15 
     16 Note that I've have some minor updates under the `src/` directory. [Some][0] [of][1] [them][2] were
     17 merged into upstream.
     18 
     19 [0]: https://propellor.branchable.com/forum/DNS_-_Support_for_Multiline_TXT_records/
     20 [1]: https://propellor.branchable.com/forum/Make_clean_fails_in_openbsd/
     21 [2]: https://propellor.branchable.com/forum/__96__Propellor.Bootstrap.cabalBuild__96___fails_in_openbsd/