path: root/doc
diff options
Diffstat (limited to 'doc')
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
+My propellor repo is at
+ git clone git://
+Note that I've have some minor updates under the `src/` directory. [Some][0] [of][1] [them][2] were
+merged into upstream.