X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=1fc6e0ba904d351ee99218237f47fc9218c989d4;hp=f12fc74080918d53cf90175c7cdcbf38fc9fe010;hb=c76a981674332abd7fbb78fb2862513e204fad7a;hpb=0aaba69e74a29c32d616a7b6e8e67659e6566d86 diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index f12fc740..1fc6e0ba 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -53,6 +53,8 @@ exit_on_error "generating revision control file list" perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update exit_on_error "doing a careful update on: $tempfile" +rm "$tempfile" + # seems to be needed to cause a merge to be resolved. git pull downstream master # -m "unfortunate merge"