From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:10:55 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly61P-0007DC-FR for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:10:55 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly61P-0007jW-6h; Tue, 29 Jun 2021 07:10:55 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly5zq-0005eu-AE; Tue, 29 Jun 2021 07:09:18 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly5zp-0005cZ-Qu; Tue, 29 Jun 2021 07:09:17 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly5zp-00AabC-Ov; Tue, 29 Jun 2021 07:09:17 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:17 +0200 Message-Id: <20210629050917.2523923-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616155631.12180-2-rhi@pengutronix.de> References: <20210616155631.12180-2-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] doc: dev manual: how to recover from patch merge conflicts with git X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false VGhhbmtzLCBhcHBsaWVkIGFzIDBhYjEwZGIxYzJkMjZhZTRkOTQ0NTRhZWRmZmE2Y2Y1MDczNDIz ZjcuCgpNaWNoYWVsCgpbc2VudCBmcm9tIHBvc3QtcmVjZWl2ZSBob29rXQoKT24gVHVlLCAyOSBK dW4gMjAyMSAwNzowOToxNyArMDIwMCwgUm9sYW5kIEhpZWJlciA8cmhpQHBlbmd1dHJvbml4LmRl PiB3cm90ZToKPiBTaWduZWQtb2ZmLWJ5OiBSb2xhbmQgSGllYmVyIDxyaGlAcGVuZ3V0cm9uaXgu ZGU+Cj4gTWVzc2FnZS1JZDogPDIwMjEwNjE2MTU1NjMxLjEyMTgwLTItcmhpQHBlbmd1dHJvbml4 LmRlPgo+IFNpZ25lZC1vZmYtYnk6IE1pY2hhZWwgT2xicmljaCA8bS5vbGJyaWNoQHBlbmd1dHJv bml4LmRlPgo+IAo+IGRpZmYgLS1naXQgYS9kb2MvZGV2X3BhdGNoaW5nLnJzdCBiL2RvYy9kZXZf cGF0Y2hpbmcucnN0Cj4gaW5kZXggZTM2OTBkZmUxYjQ4Li5hMTc5ODNhYTgyNmEgMTAwNjQ0Cj4g LS0tIGEvZG9jL2Rldl9wYXRjaGluZy5yc3QKPiArKysgYi9kb2MvZGV2X3BhdGNoaW5nLnJzdAo+ IEBAIC0xNTksNiArMTU5LDc4IEBAIHRoYXQgYXJlIGF1dG9nZW5lcmF0ZWQgaW4gYXV0b3Rvb2xz LWJhc2VkIGJ1aWxkc3lzdGVtcy4KPiAgUmVmZXIgdG8gdGhlIHNlY3Rpb24gOnJlZjpgY29uZmln dXJlX3JlYnVpbGRgIG9uIGhvdyBQVFhkaXN0IGNhbgo+ICBoYW5kbGUgdGhpcyBzcGVjaWFsIHRh c2suCj4gIAo+ICtSZWNvdmVyaW5nIGZyb20gbWVyZ2UgY29uZmxpY3RzCj4gK15eXl5eXl5eXl5e Xl5eXl5eXl5eXl5eXl5eXl5eXl4KPiArCj4gK1doZW4gdXBkYXRpbmcgcGFja2FnZXMsIGl0IGNh biBoYXBwZW4gdGhhdCBvbGRlciBwYXRjaGVzIG5vIGxvbmdlciBhcHBseS4KPiArSW4gdGhpcyBj YXNlLCB0aGUgKmV4dHJhY3QqIHN0YWdlIHdpbGwgdGhyb3cgZXJyb3JzIGxpa2UgdGhpczo6Cj4g Kwo+ICsgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICsgICB0YXJnZXQ6IGltYS1l dm0tdXRpbHMuZXh0cmFjdAo+ICsgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICsK PiArICAgZXh0cmFjdDogcGtnX3NyYz0vcHR4L3NyYy9pbWEtZXZtLXV0aWxzLTEuMy4yLnRhci5n ego+ICsgICBleHRyYWN0OiBwa2dfZXh0cmFjdF9kaXI9RGlzdHJvS2l0L3BsYXRmb3JtLXY3YS9i dWlsZC10YXJnZXQvaW1hLWV2bS11dGlscy0xLjMuMgo+ICsgICBwYXRjaGluOiBnaXQ6IGluaXRp YWxpemluZyByZXBvc2l0b3J5Cj4gKyAgIHBhdGNoaW46IGdpdDogZG9uZQo+ICsKPiArICAgcGtn X3BhdGNoX2RpcjogICAgICdwdHhkaXN0L3BhdGNoZXMvaW1hLWV2bS11dGlscy0xLjMuMicKPiAr ICAgcGtnX3BhdGNoX3NlcmllczogICdwdHhkaXN0L3BhdGNoZXMvaW1hLWV2bS11dGlscy0xLjMu Mi9zZXJpZXMnCj4gKwo+ICsgICBwYXRjaGluOiBnaXQ6IGFwcGx5ICdwdHhkaXN0L3BhdGNoZXMv aW1hLWV2bS11dGlscy0xLjMuMi9zZXJpZXMnCj4gKyAgIHRhZ2dpbmcgLT4gYmFzZQo+ICsgICAw MDAxLUlOU1RBTEwtcmVtb3ZlLWZpbGUtYXQtaXQtcy1hdXRvZ2VuZXJhdGVkLWJ5LWF1dG90b28u cGF0Y2gKPiArICAgMDAwMi1NYWtlZmlsZS5hbS1yZW5hbWUtSU5DTFVERVMtQU1fQ1BQRkxBR1Mu cGF0Y2gKPiArICAgZXJyb3I6IHBhdGNoIGZhaWxlZDogc3JjL01ha2VmaWxlLmFtOjEKPiArICAg ZXJyb3I6IHNyYy9NYWtlZmlsZS5hbTogcGF0Y2ggZG9lcyBub3QgYXBwbHkKPiArICAgbWFrZTog KioqIFvigKYvcHR4ZGlzdC9ydWxlcy9wb3N0L3B0eGRfbWFrZV93b3JsZF9leHRyYWN0Lm1ha2U6 NDE6IOKApi9EaXN0cm9LaXQvcGxhdGZvcm0tdjdhL3N0YXRlL2ltYS1ldm0tdXRpbHMuZXh0cmFj dF0gRXJyb3IgNAo+ICsKPiArSW4gdGhlIGV4YW1wbGUgYWJvdmUsIHRoZSBmaXJzdCBwYXRjaCB3 YXMgYXBwbGllZCBjbGVhbmx5LCBidXQgdGhlIHNlY29uZCBvbmUKPiArd2FzIG5vdCBiZWNhdXNl IHNyYy9NYWtlZmlsZS5hbSBjb250YWluZWQgZGlmZmVyZW50IGxpbmVzIHRoYW4gZXhwZWN0ZWQu Cj4gK0lmIHRoaXMgaGFwcGVucywgeW91IGhhdmUgdG8gY2xlYW4gdXAgdGhlIG1lcmdlIGNvbmZs aWN0LAo+ICthbmQgYXBwbHkgdGhlIHJlbWFpbmluZyBwYXRjaGVzIG1hbnVhbGx5Lgo+ICsKPiAr Rmlyc3QsIGNoYW5nZSBpbnRvIHRoZSBwYWNrYWdlJ3MgYnVpbGQgZGlyZWN0b3J5LCBhbmQgYWJv cnQgdGhlIGN1cnJlbnQgcGF0Y2g6Ogo+ICsKPiArICAg4oCmL2Rpc3Ryb2tpdC9tYXN0ZXIgKG1h c3RlcikgJCAgY2QgcGxhdGZvcm0tdjdhL2J1aWxkLXRhcmdldC9pbWEtZXZtLXV0aWxzLTEuMy4y Lwo+ICsKPiArICAg4oCmL2J1aWxkLXRhcmdldC9pbWEtZXZtLXV0aWxzLTEuMy4yIChtYXN0ZXJ8 QU0vUkVCQVNFKSAkICBnaXQgbG9nIC0tb25lbGluZSAtLWdyYXBoCj4gKyAgICogNjY4N2FiNDYw ODdjIChIRUFEIC0+IG1hc3RlcikgSU5TVEFMTDogcmVtb3ZlIGZpbGUsIGFzIGl0J3MgYXV0b2dl bmVyYXRlZCBieSBhdXRvdG9vbHMKPiArICAgKiAwMWE1MjYyNDIzN2YgKHRhZzogaW1hLWV2bS11 dGlscy0xLjMuMiwgdGFnOiBiYXNlKSBpbml0aWFsIGNvbW1pdAo+ICsKPiArICAg4oCmL2J1aWxk LXRhcmdldC9pbWEtZXZtLXV0aWxzLTEuMy4yIChtYXN0ZXJ8QU0vUkVCQVNFKSAkICBnaXQgYW0g LS1hYm9ydAo+ICsKPiArICAg4oCmL2J1aWxkLXRhcmdldC9pbWEtZXZtLXV0aWxzLTEuMy4yICht YXN0ZXIpICQKPiArCj4gKyhOb3RpY2UgaG93IHRoZSBHaXQgaW50ZWdyYXRpb24gaW4gdGhlIHNo ZWxsIHByb21wdCBzdGlsbCBzaG93cyBgYEFNL1JFQkFTRWBgCj4gK2JlZm9yZSB0aGUgY2xlYW51 cCwgc2lnbmFsaW5nIHRoZSBvbmdvaW5nIGNvbmZsaWN0IHJlc29sdXRpb24uKQo+ICsKPiArVGhl IHJlbWFpbmluZyBwYXRjaGVzIGFyZSBzdGlsbCBhdmFpbGFibGUgaW4gdGhlIGBgLi9wYXRjaGVz YGAgZGlyZWN0b3J5Cj4gK3JlbGF0aXZlIHRvIHlvdXIgY3VycmVudCBsb2NhdGlvbi4KPiArVHJ5 IHRvIGFwcGx5IGVhY2ggb2YgdGhlbSBpbiB0dXJuIHVzaW5nIGBgZ2l0IGFtYGAuCj4gK0lmIGEg cGF0Y2ggZmFpbHMgdG8gYXBwbHksIEdpdCB3aWxsIG5vdCBjaGFuZ2UgYW55IGZpbGVzLCBidXQg d2lsbCBzdGlsbAo+ICtyZW1lbWJlciB0aGUgcGF0Y2gncyBhdXRob3IgYW5kIGNvbW1pdCBtZXNz YWdlLCBhbmQgcHJvbXB0IHlvdSB0byByZXNvbHZlCj4gK3RoZSBjb25mbGljdHM6Ogo+ICsKPiAr ICAg4oCmL2J1aWxkLXRhcmdldC9pbWEtZXZtLXV0aWxzLTEuMy4yIChtYXN0ZXIpICQgIGdpdCBh bSBwYXRjaGVzLzAwMDUtZXZtY3RsLWFkZC1mYWxsYmFjay1kZWZpbml0aW9ucy1mb3ItWEFUVFJf TkFNRV9JTUEucGF0Y2gKPiArCj4gKyAgIEFwcGx5aW5nOiBldm1jdGw6IGFkZCBmYWxsYmFjayBk ZWZpbml0aW9ucyBmb3IgWEFUVFJfTkFNRV9JTUEKPiArICAgUGF0Y2ggZmFpbGVkIGF0IDAwMDUg ZXZtY3RsOiBhZGQgZmFsbGJhY2sgZGVmaW5pdGlvbnMgZm9yIFhBVFRSX05BTUVfSU1BCj4gKyAg IGhpbnQ6IFVzZSAnZ2l0IGFtIC0tc2hvdy1jdXJyZW50LXBhdGNoPWRpZmYnIHRvIHNlZSB0aGUg ZmFpbGVkIHBhdGNoCj4gKyAgIFdoZW4geW91IGhhdmUgcmVzb2x2ZWQgdGhpcyBwcm9ibGVtLCBy dW4gImdpdCBhbSAtLWNvbnRpbnVlIi4KPiArICAgSWYgeW91IHByZWZlciB0byBza2lwIHRoaXMg cGF0Y2gsIHJ1biAiZ2l0IGFtIC0tc2tpcCIgaW5zdGVhZC4KPiArICAgVG8gcmVzdG9yZSB0aGUg b3JpZ2luYWwgYnJhbmNoIGFuZCBzdG9wIHBhdGNoaW5nLCBydW4gImdpdCBhbSAtLWFib3J0Ii4K PiArCj4gKyogSWYgeW91IGZpbmQgdGhhdCB0aGUgcGF0Y2ggaXMgbm8gbG9uZ2VyIG5lY2Vzc2Fy eSAoZS5nLiBiZWNhdXNlIGl0IHdhcwo+ICsgIGFscmVhZHkgbWVyZ2VkIHVwc3RyZWFtIGluIHRo ZSBuZXcgcGFja2FnZSB2ZXJzaW9uKSwgc2tpcCBpdCB3aXRoCj4gKyAgYGBnaXQgYW0gLS1za2lw YGAuCj4gKyogT3RoZXJ3aXNlLCBhcHBseSB0aGUgc2FtZSBwYXRjaCBhZ2FpbiBtYW51YWxseSB2 aWEgYGBwYXRjaCAtLW1lcmdlIC1wMSA8Cj4gKyAgcGF0Y2hlcy9maWxlbmFtZS5wYXRjaGBgLCBh bmQgcmVzb2x2ZSBhbnkgcmVzdWx0aW5nIGNvbmZsaWN0cyB1c2luZyB5b3VyCj4gKyAgZmF2b3Vy aXRlIGVkaXRvci4KPiArKiBGaW5hbGx5LCBgYGdpdCBhbSAtLWNvbnRpbnVlYGAgY29tbWl0cyB5 b3VyIGNvbmZsaWN0IHJlc29sdXRpb24gd2l0aCB0aGUKPiArICBwYXRjaCdzIG9yaWdpbmFsIGF1 dGhvciBhbmQgbG9nIG1lc3NhZ2UuCj4gKwo+ICtBZnRlciBwb3J0aW5nIGFsbCBwYXRjaGVzLCB1 cGRhdGUgdGhlIHBhY2thZ2UncyBwYXRjaCBxdWV1ZSB3aXRoIGBgZ2l0IHB0eC1wYXRjaGVzYGAu Cj4gIAo+ICBBZGRpbmcgTW9yZSBQYXRjaGVzIHRvIGEgUGFja2FnZQo+ICA9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KcHR4ZGlzdCBtYWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQpU byB1bnN1YnNjcmliZSwgc2VuZCBhIG1haWwgd2l0aCBzdWJqZWN0ICJ1bnN1YnNjcmliZSIgdG8g cHR4ZGlzdC1yZXF1ZXN0QHBlbmd1dHJvbml4LmRlCg==