Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
I would like to either join both repos back or at least have different config files so I can merge changes from
The file that conflicts between the two is src/config.js.
If we could have
Hi @divyanshu-rawat thanks for your interest.
There are two branches on this repo:
If would be ideal to be able to start one dashboard or the other one from the same branch. In other words, only having the master branch. Perhaps we can do so by one of the following ideas (I don't know which one is possible):
Let me know if this helps. Thanks!
If we want to start both of them from the same branch let's say
what should I name the config file of master branch for
The names are very close, however, they're actually two differently named configs (to be created):
You got it.
Correct the 2nd name: master.js --> awfy.js
Thanks for looking into this!
@armenzg I spent much time on this and managed to find a solution for the same, but later one solution was not working for
Which implies that due to difference in object structure the code written in 2 different branches is different at some places, for example.
Here is the example -
This is Pickers component in master
So, the master one Picker component looks like this.
Have a look at options property, that points to
And This is the pickers component in awsy
* Support multiple dashboards * Add DASHBOARD env to neutrino. * Include awsy configuration file from [awsy branch](https://github.com/mozilla-frontend-infra/firefox-performance-dashboard/blob/awsy/src/config.js) Co-authored-by: Divyanshu Rawat <firstname.lastname@example.org>
We can now deploy both dashboard from the same code.