Archives
Archives
| From: | Matt Turner <mattst88@g.o> | ||
|---|---|---|---|
| To: | gentoo development <gentoo-dev@l.g.o> | ||
| Subject: | Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... | ||
| Date: | Tue, 02 Mar 2021 19:02:51 | ||
| Message-Id: | CAEdQ38HBdDC75MY0zLD6oc8ypyMEUE=5i8rmVPEbQ+GcNFm0wg@mail.gmail.com | ||
| In Reply to: | Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... by Michael Orlitzky |
||
| 1 | On Tue, Mar 2, 2021 at 12:11 AM Michael Orlitzky <mjo@g.o> wrote: |
| 2 | > why don't we just enforce putting each |
| 3 | > keyword on a separate line instead, so that we don't have this problem |
| 4 | > in the first place? |
| 5 | |
| 6 | Why don't we change 30 thousand ebuilds rather than use this script? |
| Subject | Author |
|---|---|
| Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... | Alessandro Barbieri <lssndrbarbieri@×××××.com> |
| Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... | Michael Orlitzky <mjo@g.o> |