Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DFA77200B54 for ; Thu, 28 Jul 2016 21:25:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DE35C160A85; Thu, 28 Jul 2016 19:25:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 56DAB160A56 for ; Thu, 28 Jul 2016 21:25:11 +0200 (CEST) Received: (qmail 45981 invoked by uid 500); 28 Jul 2016 19:25:05 -0000 Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list dev@activemq.apache.org Received: (qmail 45970 invoked by uid 99); 28 Jul 2016 19:25:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2016 19:25:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12E41E0100; Thu, 28 Jul 2016 19:25:05 +0000 (UTC) From: clebertsuconic To: dev@activemq.apache.org Reply-To: dev@activemq.apache.org Message-ID: Subject: [GitHub] activemq-artemis pull request #682: Adding set -e on merge script Content-Type: text/plain Date: Thu, 28 Jul 2016 19:25:05 +0000 (UTC) archived-at: Thu, 28 Jul 2016 19:25:12 -0000 GitHub user clebertsuconic opened a pull request: https://github.com/apache/activemq-artemis/pull/682 Adding set -e on merge script I had some cases where I had pending changes on my local copy and the script silent failed. This will make sure people using this script would notice any failure during a merge You can merge this pull request into a Git repository by running: $ git pull https://github.com/clebertsuconic/activemq-artemis script Alternatively you can review and apply these changes as the patch at: https://github.com/apache/activemq-artemis/pull/682.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #682 ---- commit 5f51ef4e213d60802ba07052dfe21231911db1f8 Author: Clebert Suconic Date: 2016-07-28T19:23:57Z Adding set -e on merge script I had some cases where I had pending changes on my local copy and the script silent failed. This will make sure people using this script would notice any failure during a merge ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---