Re: [aerogear-dev] aerogear.org revamp: team work

Hi Corinne, I was giving a look at sass branch and I’m really concerned due to the number of conflicts with “master”. I think for the sanity of everyone, is healthy to regularly rebase that branch against master like Corinne mentioned before. I tried rebase, but due to my poor sass skills, I’m afraid of mess it up. What I did? git checkout sass git rebase origin/master -- abstractj On February 24, 2014 at 11:09:59 AM, Corinne Krych (corinnekrych(a)gmail.com) wrote: > Hello All, > > With aerogear web site roadmap [1] proposal we can start working together toward a new > website. We already have a common branch (named sass - maybe not the best name) [2] where > we can work together. It’s important to rebase/keep this branch up to date. > > Here is how we could work together efficiently: > - take JIRA for 0.1.0 release, > - branch from sass branch, do you work > - send PR againt sass. > - usual PR review > - then PR can be merged into sass. > > If a ticket requires changes in page documentation like splitting a markdown page into > several pages or move to asciidoc format etc… we should do this JIRA initial in master > branch, send a PRL, get the PR merged and get the changes in sass branch. This way we can > keep history and let the documentation evolves without fear for merging it into new site > revamp branch. > > Thought? #agreed? > > ++ > Corinne > [1] http://aerogear.org/docs/planning/roadmaps/AeroGearWebSite/ > [2 https://github.com/aerogear/aerogear.org/tree/sass > _______________________________________________ > aerogear-dev mailing list > aerogear-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/aerogear-dev >