I don't see a difference in the merge process? A feature branch should be treated exactly the same as master; the only difference is that it's a branch which people must specifically pull in order to use instead of being master.
When merging, you can either do a regular rebase/merge as in the git practices documentation or you can choose to rebase/squash on the branched commits prior to pushing the merge. There is no rewriting within the branch, but you can still rewrite anything which has not been pushed to master just prior to pushing it to master. On Mon, Nov 20, 2017 at 9:00 PM Jean-Philippe André <[email protected]> wrote: > Hey, > > If we can't rewrite history on those branches (rebase and push -f), how > should we proceed with the merge to/from master? > Usually when we merge a branch to master, we rebase it on top of master > first and then rebase. That's how our history remains linear and simple. > > What's the idea here? I wonder. > > Thanks for implementing this btw, > > 2017-11-21 8:49 GMT+09:00 Tom Hacohen <[email protected]>: > > > I'm not sure about jenkins, that's Stefan's role. > > > > Anyhow, pushed the changes according to the wiki. Please consider > > especially mentioning probies when you say "everyone can push to". > > > > -- > > Tom. > > > > On Mon, Nov 20, 2017 at 3:27 PM, Mike Blumenkrantz > > <[email protected]> wrote: > > > I've added all the necessary info to the documentation at > > > > https://www.enlightenment.org/contrib/devs/git-guide.md#Feature_Branches > > > > > > If the jenkins concept is not possible then feel free to remove, but > the > > > rest should be in line with what we want. > > > > > > On Mon, Nov 13, 2017 at 6:54 AM Tom Hacohen <[email protected]> wrote: > > > > > >> So what has been decided? What should I do? I need specs, preferably > > >> already added to the git wiki page so there are docs for this thing. > > >> > > >> On Wed, Nov 8, 2017 at 11:57 PM, Carsten Haitzler < > [email protected] > > > > > >> wrote: > > >> > On Wed, 08 Nov 2017 21:39:15 +0000 Mike Blumenkrantz > > >> > <[email protected]> said: > > >> > > > >> >> Key points for the implementation: > > >> >> > > >> >> * all commits send mails to the list > > >> >> * no rewrite of pushed commits > > >> >> > > >> >> Things to consider: > > >> >> * how are feature/ branches deleted? > > >> >> - maybe anyone can delete? > > >> > > > >> > Good point. these need deletion. after a few years it'll be a mess > of > > old > > >> > feature branches no one will ever look at again. The merge to master > > >> should > > >> > contain all the history and log that is needed at that point for > > history > > >> > digging. > > >> > > > >> >> * do probies get feature/ push access? > > >> >> - seems like they should? > > >> >> > > >> >> On Wed, Nov 8, 2017 at 2:42 PM Tom Hacohen <[email protected]> wrote: > > >> >> > > >> >> > Yeah, good idea. > > >> >> > > > >> >> > I'll take a look into implementing it soon. > > >> >> > > > >> >> > On Tue, Nov 7, 2017 at 8:50 PM, Andrew Williams < > > [email protected] > > >> > > > >> >> > wrote: > > >> >> > > Hi, > > >> >> > > > > >> >> > > That sounds great - the ability to work together on features > > >> off-master > > >> >> > > would be really helpful. > > >> >> > > > > >> >> > > Andy > > >> >> > > > > >> >> > > On Tue, 7 Nov 2017 at 16:15, Mike Blumenkrantz < > > >> >> > > [email protected]> wrote: > > >> >> > > > > >> >> > >> After some discussions about git organization, it's become > clear > > >> to me > > >> >> > that > > >> >> > >> we should be trying to enact some changes which facilitate > > >> >> > collaboration, > > >> >> > >> both between existing contributors and keeping in mind future > > >> >> > contributors. > > >> >> > >> > > >> >> > >> The current git branch policy is this: > > >> >> > >> > > >> >> > >> * master > > >> >> > >> * $project-$version > > >> >> > >> * devs/$name/$branchname > > >> >> > >> > > >> >> > >> No others are allowed. This fits many use cases, but it does > not > > >> >> > actually > > >> >> > >> help us work towards collaborating on features/patchsets and > > >> instead > > >> >> > >> promotes developing in isolation. > > >> >> > >> > > >> >> > >> A simple proposal could improve this without requiring or > > >> significantly > > >> >> > >> changing our workflow: add "feature/" branches. For example, > if > > >> Cedric > > >> >> > and > > >> >> > >> I decide to work on a "feature" which scrapes the archive of > > this > > >> >> > mailing > > >> >> > >> list and then crashes the session of anyone who replies to > this > > >> thread, > > >> >> > we > > >> >> > >> might jointly create a branch named > "feature/discussion_helper" > > >> and push > > >> >> > >> commits to it. > > >> >> > >> > > >> >> > >> A key point of this proposal would be that the feature/ > branches > > >> must > > >> >> > >> trigger mails to the mailing list just like stable branches. > > This > > >> would > > >> >> > >> increase visibility for feature branches as well as promote > > further > > >> >> > >> collaboration even from those who are not directly involved in > > >> creating > > >> >> > the > > >> >> > >> feature. The initial feature development could be done in a > dev/ > > >> branch, > > >> >> > >> and then it could later move to a feature/ branch once it has > > >> >> > progressed to > > >> >> > >> the point where it is ready for public visibility and > increased > > >> >> > >> collaboration. > > >> >> > >> > > >> >> > >> Lastly, feature branches would not be required use, just > > >> encouraged. > > >> >> > This > > >> >> > >> allows people to continue the current EFL standard of always > > >> committing > > >> >> > >> only to master without any prior testing or branching, the > need > > for > > >> >> > which > > >> >> > >> has defeated other proposals which would prevent such action. > > >> >> > >> > > >> >> > >> I think this could yield significant improvements to the > > >> community's > > >> >> > >> overall workflow without massively changing the structure > under > > >> which > > >> >> > the > > >> >> > >> everyone has been functioning. > > >> >> > >> > > >> >> > >> > > >> >> > > > >> ------------------------------------------------------------ > > ------------------ > > >> >> > >> Check out the vibrant tech community on one of the world's > most > > >> >> > >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> >> > >> _______________________________________________ > > >> >> > >> enlightenment-devel mailing list > > >> >> > >> [email protected] > > >> >> > >> https://lists.sourceforge.net/lists/listinfo/enlightenment- > > devel > > >> >> > >> > > >> >> > > -- > > >> >> > > http://andywilliams.me > > >> >> > > http://ajwillia.ms > > >> >> > > > > >> >> > > > >> ------------------------------------------------------------ > > ------------------ > > >> >> > > Check out the vibrant tech community on one of the world's most > > >> >> > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> >> > > _______________________________________________ > > >> >> > > enlightenment-devel mailing list > > >> >> > > [email protected] > > >> >> > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > >> >> > > > >> >> > > > >> >> > > > >> ------------------------------------------------------------ > > ------------------ > > >> >> > Check out the vibrant tech community on one of the world's most > > >> >> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> >> > _______________________________________________ > > >> >> > enlightenment-devel mailing list > > >> >> > [email protected] > > >> >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > >> >> > > > >> >> > > >> ------------------------------------------------------------ > > ------------------ > > >> >> Check out the vibrant tech community on one of the world's most > > >> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> >> _______________________________________________ > > >> >> enlightenment-devel mailing list > > >> >> [email protected] > > >> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > >> >> > > >> > > > >> > > > >> > -- > > >> > ------------- Codito, ergo sum - "I code, therefore I am" > > -------------- > > >> > Carsten Haitzler - [email protected] > > >> > > > >> > > > >> > > > >> ------------------------------------------------------------ > > ------------------ > > >> > Check out the vibrant tech community on one of the world's most > > >> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> > _______________________________________________ > > >> > enlightenment-devel mailing list > > >> > [email protected] > > >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > >> > > >> > > >> ------------------------------------------------------------ > > ------------------ > > >> Check out the vibrant tech community on one of the world's most > > >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > >> _______________________________________________ > > >> enlightenment-devel mailing list > > >> [email protected] > > >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > >> > > > ------------------------------------------------------------ > > ------------------ > > > Check out the vibrant tech community on one of the world's most > > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > > _______________________________________________ > > > enlightenment-devel mailing list > > > [email protected] > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > ------------------------------------------------------------ > > ------------------ > > Check out the vibrant tech community on one of the world's most > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > _______________________________________________ > > enlightenment-devel mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > -- > Jean-Philippe André > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > enlightenment-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
