Gentoo Archives: gentoo-dev

From: Brian Dolbec <dolsen@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Git workflow
Date: Sun, 05 Jul 2015 19:23:07
Message-Id: 20150705122227.7e5765b7.dolsen@gentoo.org
In Reply to: Re: [gentoo-dev] Git workflow by NP-Hardass
1 -----BEGIN PGP SIGNED MESSAGE-----
2 Hash: SHA512
3
4 On Sun, 5 Jul 2015 15:00:26 -0400
5 NP-Hardass <NP-Hardass@g.o> wrote:
6
7 > -----BEGIN PGP SIGNED MESSAGE-----
8 > Hash: SHA256
9 >
10 > On July 5, 2015 2:57:14 PM EDT, William Hubbs <williamh@g.o>
11 > wrote:
12 > >If you are working on a topic branch to make your changes, which has
13 > >not
14 > >been published, just rebase that branch on master, then merge it to
15 > >master, and no one knows any different.
16 > >
17 > >William
18 >
19 >
20 > Speaking of which... Will there be some sort of standard or policy
21 > regarding branch names?
22 >
23 > - --
24 > NP-Hardass
25
26
27 I would think that there would be a very small number of branches to the
28 main master tree. Those would be for the large projects like kde,
29 gnome,... They would still do their development work in their
30 overlays, then move them into a branch for final prep and checks, then
31 merge from there into master with one merge commit.
32
33 Any other small branches could live in developer space if they needed
34 to share them with one or two others. With git it is easy to add other
35 remotes to pull and checkout from. So, no need to clutter up the main
36 git repo with small experimental branches.
37
38 - --
39 Brian Dolbec <dolsen>
40
41 -----BEGIN PGP SIGNATURE-----
42 Version: GnuPG v2.1
43
44 iQJ8BAEBCgBmBQJVmYP0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
45 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG
46 QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YCYkP/3rQW/tBdwz7Aw+hm3wur85n
47 V8wzEKy5Xaf4oFhoFZPhE/VGFwxp2Bgy+mMjKMgJnlB3Ai6DVLJ50reAxmrcj/x9
48 juGTqEZRris3FiJ76DhdhCG4/jQMcA1n5Xrh/RoqD0b3OZuBBcT14xEireytNLAc
49 BEmtDUvi51KKLJP5SAHArCXknGP/KLaxbsTqTpBi9apfi7Apg+N1bDLLxRWBKCUD
50 NfVGU8ne1/LIi0GDqfuEOb6s+LkSKr5N1DGbJI6xYoPxt0ZUu/MJPnDSuPocfMT3
51 RaJlgmcQ4keO9EZZIyud0bFxRMJeW4YkLwACi/Fi+7DaZN2RKqXWRIF2UxDMJkBN
52 UJMcUzOj/hOcKSkrNDpzcgd41XldCEQ3a3Hj/o3PiSerJfPNJHc9+EbzQ5qD4WnY
53 LbTeqWRSdXeWN4lEJlc2hkE1El6cXhO02AgO59LarTjHYvE3AbFcJsRrZs2gKoSf
54 DES3nfHy4NtET/mcctfVdMo/0hHQ9ca/U8AgRoEe4HJIZsKNvGqkvlGm851Zw6QD
55 opE28fgtqzrZBK4CWukcHdpkouuizlFrkdoBGM6fGfixj9dWyCdLXJBSZv4+u6cp
56 HS4AjxzSzq2aUnK0T+rT00Tiuc8x1Hb/TJDjhzSmVUd3UfVIPAWz+Z8TvGnZMLbH
57 id7ovWmGfURvlzVUyBl4
58 =ePhP
59 -----END PGP SIGNATURE-----

Replies

Subject Author
Re: [gentoo-dev] Git workflow Rich Freeman <rich0@g.o>