From patchwork Wed Apr 1 09:15:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 3366 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A5DDF629B9 for ; Wed, 1 Apr 2020 11:16:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lFFK8pYe"; dkim-atps=neutral Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F124A2A; Wed, 1 Apr 2020 11:16:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1585732561; bh=GpF2dkXKeMMZE7AeGqdoE5dN1XnouXFhm9PyzUD4ac0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFFK8pYepIrW3TZbkJCH8cOmgE8hzDekm6FrfQzy6RyZM1XZfUvNzPtuqQrDinqXK K4dvc+pYsumy0uyavhkvaiBqCki7CNS0ctkwoiBssJoWUSkiWYu0xyEE0hODpltidV 11fGImA121PgXsWMaoml4pCrcze0j8zmqcjLfvTI= From: Kieran Bingham To: libcamera devel Date: Wed, 1 Apr 2020 10:15:53 +0100 Message-Id: <20200401091553.28187-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200401091553.28187-1-kieran.bingham@ideasonboard.com> References: <20200401091553.28187-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4.1 3/3] libcamera: Prevent merge conflicts X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 09:16:01 -0000 Merge conflicts are a terrible effect of rebasing code, and they impede the development process. Provide a useful helper header to ensure that merge-conflicts are no longer an issue, and make sure that both sides of the conflict are compile tested on average at least every other compile cycle. Based on reliable advice from [0]. [0] https://twitter.com/erdgeist/status/1197283439000637441 Signed-off-by: Kieran Bingham --- src/libcamera/include/merge_conflicts.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/libcamera/include/merge_conflicts.h diff --git a/src/libcamera/include/merge_conflicts.h b/src/libcamera/include/merge_conflicts.h new file mode 100644 index 000000000000..6e5b69a78c7a --- /dev/null +++ b/src/libcamera/include/merge_conflicts.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2020, Kieran Bingham + * + * merge_conflicts.h - Automatic merge conflict resolution + */ + +#ifndef __LIBCAMERA_MERGE_CONFLICT_H__ +#define __LIBCAMERA_MERGE_CONFLICT_H__ + +namespace libcamera { + +#ifndef __DOXYGEN__ + +#define <<<<<<<< #if RANDOM % 2 +#define ======== #else +#define >>>>>>>> #endif + +#endif + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_MERGE_CONFLICT_H__ */