I’ve reviewed and just fixed the genrated css file  and the site looks good to me with
the latest mmaster chnages incorporated.
+1 to carry on merging into sass branch.
a New reabase might be needed as it’s already one week old.. sorry for the delay.
Ahoy, I did the rebase
. But due to my great skills on
sass, something is wrong.
On March 19, 2014 at 11:01:25 AM, Corinne Krych (corinnekrych(a)gmail.com) wrote:
> Let me rebase.
> On 19 Mar 2014, at 14:01, Bruno Oliveira wrote:
>> Hi Corinne, I was giving a look at sass branch and I’m really concerned due to
> of conflicts with “master”.
>> I think for the sanity of everyone, is healthy to regularly rebase that branch
> 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
>> On February 24, 2014 at 11:09:59 AM, Corinne Krych (corinnekrych(a)gmail.com)
>>> Hello All,
>>> With aerogear web site roadmap  proposal we can start working together
>>> website. We already have a common branch (named sass - maybe not the best
name)  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
>>> several pages or move to asciidoc format etc… we should do this JIRA initial
>>> 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
>>> revamp branch.
>>> Thought? #agreed?
>>>  http://aerogear.org/docs/planning/roadmaps/AeroGearWebSite/
>>> [2 https://github.com/aerogear/aerogear.org/tree/sass
>>> aerogear-dev mailing list