From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 16 Jun 2021 17:57:19 +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 1ltXup-0002ql-Qf for lore@lore.pengutronix.de; Wed, 16 Jun 2021 17:57:19 +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 1ltXup-0007yV-JA; Wed, 16 Jun 2021 17:57:19 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltXu6-0007lU-At; Wed, 16 Jun 2021 17:56:34 +0200 Received: from rhi by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ltXu6-0003am-2G; Wed, 16 Jun 2021 17:56:34 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Date: Wed, 16 Jun 2021 17:56:31 +0200 Message-Id: <20210616155631.12180-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210616155631.12180-1-rhi@pengutronix.de> References: <20210616155631.12180-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/2] 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 U2lnbmVkLW9mZi1ieTogUm9sYW5kIEhpZWJlciA8cmhpQHBlbmd1dHJvbml4LmRlPgotLS0KSWYg c29tZW9uZSBjb3VsZCB3cml0ZSBhIHNpbWlsYXIgc2VjdGlvbiBmb3IgdGhlIHF1aWx0IHdvcmtm bG93LCB0aGF0CndvdWxkIGJlIGdyZWF0LCBhcyBJIGRvbid0IGtub3cgdG9vIG11Y2ggYWJvdXQg cXVpbHQgOi0pCgogZG9jL2Rldl9wYXRjaGluZy5yc3QgfCA3MiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDcyIGluc2VydGlvbnMo KykKCmRpZmYgLS1naXQgYS9kb2MvZGV2X3BhdGNoaW5nLnJzdCBiL2RvYy9kZXZfcGF0Y2hpbmcu cnN0CmluZGV4IGUzNjkwZGZlMWI0OC4uYTE3OTgzYWE4MjZhIDEwMDY0NAotLS0gYS9kb2MvZGV2 X3BhdGNoaW5nLnJzdAorKysgYi9kb2MvZGV2X3BhdGNoaW5nLnJzdApAQCAtMTU5LDYgKzE1OSw3 OCBAQCB0aGF0IGFyZSBhdXRvZ2VuZXJhdGVkIGluIGF1dG90b29scy1iYXNlZCBidWlsZHN5c3Rl bXMuCiBSZWZlciB0byB0aGUgc2VjdGlvbiA6cmVmOmBjb25maWd1cmVfcmVidWlsZGAgb24gaG93 IFBUWGRpc3QgY2FuCiBoYW5kbGUgdGhpcyBzcGVjaWFsIHRhc2suCiAKK1JlY292ZXJpbmcgZnJv bSBtZXJnZSBjb25mbGljdHMKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworV2hl biB1cGRhdGluZyBwYWNrYWdlcywgaXQgY2FuIGhhcHBlbiB0aGF0IG9sZGVyIHBhdGNoZXMgbm8g bG9uZ2VyIGFwcGx5LgorSW4gdGhpcyBjYXNlLCB0aGUgKmV4dHJhY3QqIHN0YWdlIHdpbGwgdGhy b3cgZXJyb3JzIGxpa2UgdGhpczo6CisKKyAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CisgICB0YXJnZXQ6IGltYS1ldm0tdXRpbHMuZXh0cmFjdAorICAgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KKworICAgZXh0cmFjdDogcGtnX3NyYz0vcHR4L3NyYy9pbWEtZXZtLXV0aWxz LTEuMy4yLnRhci5negorICAgZXh0cmFjdDogcGtnX2V4dHJhY3RfZGlyPURpc3Ryb0tpdC9wbGF0 Zm9ybS12N2EvYnVpbGQtdGFyZ2V0L2ltYS1ldm0tdXRpbHMtMS4zLjIKKyAgIHBhdGNoaW46IGdp dDogaW5pdGlhbGl6aW5nIHJlcG9zaXRvcnkKKyAgIHBhdGNoaW46IGdpdDogZG9uZQorCisgICBw a2dfcGF0Y2hfZGlyOiAgICAgJ3B0eGRpc3QvcGF0Y2hlcy9pbWEtZXZtLXV0aWxzLTEuMy4yJwor ICAgcGtnX3BhdGNoX3NlcmllczogICdwdHhkaXN0L3BhdGNoZXMvaW1hLWV2bS11dGlscy0xLjMu Mi9zZXJpZXMnCisKKyAgIHBhdGNoaW46IGdpdDogYXBwbHkgJ3B0eGRpc3QvcGF0Y2hlcy9pbWEt ZXZtLXV0aWxzLTEuMy4yL3NlcmllcycKKyAgIHRhZ2dpbmcgLT4gYmFzZQorICAgMDAwMS1JTlNU QUxMLXJlbW92ZS1maWxlLWF0LWl0LXMtYXV0b2dlbmVyYXRlZC1ieS1hdXRvdG9vLnBhdGNoCisg ICAwMDAyLU1ha2VmaWxlLmFtLXJlbmFtZS1JTkNMVURFUy1BTV9DUFBGTEFHUy5wYXRjaAorICAg ZXJyb3I6IHBhdGNoIGZhaWxlZDogc3JjL01ha2VmaWxlLmFtOjEKKyAgIGVycm9yOiBzcmMvTWFr ZWZpbGUuYW06IHBhdGNoIGRvZXMgbm90IGFwcGx5CisgICBtYWtlOiAqKiogW+KApi9wdHhkaXN0 L3J1bGVzL3Bvc3QvcHR4ZF9tYWtlX3dvcmxkX2V4dHJhY3QubWFrZTo0MTog4oCmL0Rpc3Ryb0tp dC9wbGF0Zm9ybS12N2Evc3RhdGUvaW1hLWV2bS11dGlscy5leHRyYWN0XSBFcnJvciA0CisKK0lu IHRoZSBleGFtcGxlIGFib3ZlLCB0aGUgZmlyc3QgcGF0Y2ggd2FzIGFwcGxpZWQgY2xlYW5seSwg YnV0IHRoZSBzZWNvbmQgb25lCit3YXMgbm90IGJlY2F1c2Ugc3JjL01ha2VmaWxlLmFtIGNvbnRh aW5lZCBkaWZmZXJlbnQgbGluZXMgdGhhbiBleHBlY3RlZC4KK0lmIHRoaXMgaGFwcGVucywgeW91 IGhhdmUgdG8gY2xlYW4gdXAgdGhlIG1lcmdlIGNvbmZsaWN0LAorYW5kIGFwcGx5IHRoZSByZW1h aW5pbmcgcGF0Y2hlcyBtYW51YWxseS4KKworRmlyc3QsIGNoYW5nZSBpbnRvIHRoZSBwYWNrYWdl J3MgYnVpbGQgZGlyZWN0b3J5LCBhbmQgYWJvcnQgdGhlIGN1cnJlbnQgcGF0Y2g6OgorCisgICDi gKYvZGlzdHJva2l0L21hc3RlciAobWFzdGVyKSAkICBjZCBwbGF0Zm9ybS12N2EvYnVpbGQtdGFy Z2V0L2ltYS1ldm0tdXRpbHMtMS4zLjIvCisKKyAgIOKApi9idWlsZC10YXJnZXQvaW1hLWV2bS11 dGlscy0xLjMuMiAobWFzdGVyfEFNL1JFQkFTRSkgJCAgZ2l0IGxvZyAtLW9uZWxpbmUgLS1ncmFw aAorICAgKiA2Njg3YWI0NjA4N2MgKEhFQUQgLT4gbWFzdGVyKSBJTlNUQUxMOiByZW1vdmUgZmls ZSwgYXMgaXQncyBhdXRvZ2VuZXJhdGVkIGJ5IGF1dG90b29scworICAgKiAwMWE1MjYyNDIzN2Yg KHRhZzogaW1hLWV2bS11dGlscy0xLjMuMiwgdGFnOiBiYXNlKSBpbml0aWFsIGNvbW1pdAorCisg ICDigKYvYnVpbGQtdGFyZ2V0L2ltYS1ldm0tdXRpbHMtMS4zLjIgKG1hc3RlcnxBTS9SRUJBU0Up ICQgIGdpdCBhbSAtLWFib3J0CisKKyAgIOKApi9idWlsZC10YXJnZXQvaW1hLWV2bS11dGlscy0x LjMuMiAobWFzdGVyKSAkCisKKyhOb3RpY2UgaG93IHRoZSBHaXQgaW50ZWdyYXRpb24gaW4gdGhl IHNoZWxsIHByb21wdCBzdGlsbCBzaG93cyBgYEFNL1JFQkFTRWBgCitiZWZvcmUgdGhlIGNsZWFu dXAsIHNpZ25hbGluZyB0aGUgb25nb2luZyBjb25mbGljdCByZXNvbHV0aW9uLikKKworVGhlIHJl bWFpbmluZyBwYXRjaGVzIGFyZSBzdGlsbCBhdmFpbGFibGUgaW4gdGhlIGBgLi9wYXRjaGVzYGAg ZGlyZWN0b3J5CityZWxhdGl2ZSB0byB5b3VyIGN1cnJlbnQgbG9jYXRpb24uCitUcnkgdG8gYXBw bHkgZWFjaCBvZiB0aGVtIGluIHR1cm4gdXNpbmcgYGBnaXQgYW1gYC4KK0lmIGEgcGF0Y2ggZmFp bHMgdG8gYXBwbHksIEdpdCB3aWxsIG5vdCBjaGFuZ2UgYW55IGZpbGVzLCBidXQgd2lsbCBzdGls bAorcmVtZW1iZXIgdGhlIHBhdGNoJ3MgYXV0aG9yIGFuZCBjb21taXQgbWVzc2FnZSwgYW5kIHBy b21wdCB5b3UgdG8gcmVzb2x2ZQordGhlIGNvbmZsaWN0czo6CisKKyAgIOKApi9idWlsZC10YXJn ZXQvaW1hLWV2bS11dGlscy0xLjMuMiAobWFzdGVyKSAkICBnaXQgYW0gcGF0Y2hlcy8wMDA1LWV2 bWN0bC1hZGQtZmFsbGJhY2stZGVmaW5pdGlvbnMtZm9yLVhBVFRSX05BTUVfSU1BLnBhdGNoCisK KyAgIEFwcGx5aW5nOiBldm1jdGw6IGFkZCBmYWxsYmFjayBkZWZpbml0aW9ucyBmb3IgWEFUVFJf TkFNRV9JTUEKKyAgIFBhdGNoIGZhaWxlZCBhdCAwMDA1IGV2bWN0bDogYWRkIGZhbGxiYWNrIGRl ZmluaXRpb25zIGZvciBYQVRUUl9OQU1FX0lNQQorICAgaGludDogVXNlICdnaXQgYW0gLS1zaG93 LWN1cnJlbnQtcGF0Y2g9ZGlmZicgdG8gc2VlIHRoZSBmYWlsZWQgcGF0Y2gKKyAgIFdoZW4geW91 IGhhdmUgcmVzb2x2ZWQgdGhpcyBwcm9ibGVtLCBydW4gImdpdCBhbSAtLWNvbnRpbnVlIi4KKyAg IElmIHlvdSBwcmVmZXIgdG8gc2tpcCB0aGlzIHBhdGNoLCBydW4gImdpdCBhbSAtLXNraXAiIGlu c3RlYWQuCisgICBUbyByZXN0b3JlIHRoZSBvcmlnaW5hbCBicmFuY2ggYW5kIHN0b3AgcGF0Y2hp bmcsIHJ1biAiZ2l0IGFtIC0tYWJvcnQiLgorCisqIElmIHlvdSBmaW5kIHRoYXQgdGhlIHBhdGNo IGlzIG5vIGxvbmdlciBuZWNlc3NhcnkgKGUuZy4gYmVjYXVzZSBpdCB3YXMKKyAgYWxyZWFkeSBt ZXJnZWQgdXBzdHJlYW0gaW4gdGhlIG5ldyBwYWNrYWdlIHZlcnNpb24pLCBza2lwIGl0IHdpdGgK KyAgYGBnaXQgYW0gLS1za2lwYGAuCisqIE90aGVyd2lzZSwgYXBwbHkgdGhlIHNhbWUgcGF0Y2gg YWdhaW4gbWFudWFsbHkgdmlhIGBgcGF0Y2ggLS1tZXJnZSAtcDEgPAorICBwYXRjaGVzL2ZpbGVu YW1lLnBhdGNoYGAsIGFuZCByZXNvbHZlIGFueSByZXN1bHRpbmcgY29uZmxpY3RzIHVzaW5nIHlv dXIKKyAgZmF2b3VyaXRlIGVkaXRvci4KKyogRmluYWxseSwgYGBnaXQgYW0gLS1jb250aW51ZWBg IGNvbW1pdHMgeW91ciBjb25mbGljdCByZXNvbHV0aW9uIHdpdGggdGhlCisgIHBhdGNoJ3Mgb3Jp Z2luYWwgYXV0aG9yIGFuZCBsb2cgbWVzc2FnZS4KKworQWZ0ZXIgcG9ydGluZyBhbGwgcGF0Y2hl cywgdXBkYXRlIHRoZSBwYWNrYWdlJ3MgcGF0Y2ggcXVldWUgd2l0aCBgYGdpdCBwdHgtcGF0Y2hl c2BgLgogCiBBZGRpbmcgTW9yZSBQYXRjaGVzIHRvIGEgUGFja2FnZQogPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0gCjIuMjkuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCnB0eGRpc3QgbWFpbGluZyBsaXN0CnB0eGRpc3RAcGVuZ3V0 cm9uaXguZGUKVG8gdW5zdWJzY3JpYmUsIHNlbmQgYSBtYWlsIHdpdGggc3ViamVjdCAidW5zdWJz Y3JpYmUiIHRvIHB0eGRpc3QtcmVxdWVzdEBwZW5ndXRyb25peC5kZQo=