# Avoiding conflicts in welcome PRs **URL:** \ **Category:** Development\ **Created:** [August 1, 2021, 5:06pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338 "2021-08-01T17:06:43Z")\ **Posts on this page:** 20\ **Page:** 1
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 1, 2021, 5:06pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/1 "2021-08-01T17:06:43Z")
**Problem -** When developers send their welcome PR to the sef-dev repo, it will generate conflicts because the PR’s are sending to update the same JSON file. **Suggested solutions -** @jaye and @Gravewalker suggest [Jekyll](https://jekyll.github.io/jekyll-admin/api/) as a solution for this issue and assign me to work on that. **Progress -** Right now I’m learning how to implement it. And I will update the progress under this thread. Any other suggestions are open from you all. 🙂 ---
**Author:** ![Gravewalker](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/gravewalker/32/12_2.png) [@Gravewalker](https://sef.discourse.group/u/Gravewalker)\ **Post date:** [August 1, 2021, 5:09pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/2 "2021-08-01T17:09:38Z")
Nice, let me know if you need to take a call or anything ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 1, 2021, 5:17pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/3 "2021-08-01T17:17:42Z")
Sure I’ll let you know. ---
**Author:** ![jaye](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/jaye/32/810_2.png) [@jaye](https://sef.discourse.group/u/jaye)\ **Post date:** [August 1, 2021, 5:18pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/4 "2021-08-01T17:18:01Z")
Thanks for initiating this task, Pasindu. Do your magic! 😍 ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 1, 2021, 5:23pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/5 "2021-08-01T17:23:54Z")
Thank you!! @jaye. Will do my best. ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 9, 2021, 6:33am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/6 "2021-08-09T06:33:59Z")
**Progress update -** For now, did some experiments with Jekyll to create a JSON array with profiles that are created by separate user profiles with MD files. And it’s locally working now. I post that test repo in Git hub also - [https://github.com/pasindur99/Siri\_JekyllTest](https://github.com/pasindur99/Siri_JekyllTest) @jaye suggests that we will need a separate repo for deploy this Jekyll project. After creating that repo I can create a pull request for test this. 🙂 ---
**Author:** ![jaye](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/jaye/32/810_2.png) [@jaye](https://sef.discourse.group/u/jaye)\ **Post date:** [August 9, 2021, 11:39am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/7 "2021-08-09T11:39:08Z")
This is a good progress @Pasindu_Rupasinghe!! 🤗 Here’s a preview link of the json output. [https://pasindur99.github.io/Siri\_JekyllTest/about.json](https://pasindur99.github.io/Siri_JekyllTest/about.json) I tested it for CORS. It won’t be an issue because it returns an `Access-Control-Allow-Origin: *` header. `curl -vL https://pasindur99.github.io/Siri_JekyllTest/about.json 2>&1 | fgrep -i access-control-allow-origin` returns: `access-control-allow-origin: *` @Gravewalker Could you please create a separate repo for the welcome PRs? Pasindu, let’s rename the output as profiles.json and remove the unwanted files from the repo. ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 10, 2021, 3:18am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/8 "2021-08-10T03:18:53Z")
@jaye I think it’s good to create a new repo instead of using this test one. Because I did a lot of testing in this repository. It’s easy to create a new one without using it. I can send a PR for that once @Gravewalker creates a repo. ---
**Author:** ![Gravewalker](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/gravewalker/32/12_2.png) [@Gravewalker](https://sef.discourse.group/u/Gravewalker)\ **Post date:** [August 10, 2021, 9:53am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/9 "2021-08-10T09:53:20Z")
Impressive work @Pasindu_Rupasinghe. > [@jaye](#): > > @Gravewalker Could you please create a separate repo for the welcome PRs? Sure 🙂 ---
**Author:** ![Gravewalker](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/gravewalker/32/12_2.png) [@Gravewalker](https://sef.discourse.group/u/Gravewalker)\ **Post date:** [August 11, 2021, 9:57am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/10 "2021-08-11T09:57:37Z")
@Pasindu_Rupasinghe Here you go, use this repo [https://github.com/sef-global/dev-welcome-pr](https://github.com/sef-global/dev-welcome-pr) ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 11, 2021, 3:03pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/11 "2021-08-11T15:03:10Z")
Okay. I’ll notify you once my pr has been sent. 🙂 ---
**Author:** ![jaye](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/jaye/32/810_2.png) [@jaye](https://sef.discourse.group/u/jaye)\ **Post date:** [August 12, 2021, 4:02am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/12 "2021-08-12T04:02:01Z")
Thanks @Gravewalker ! ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 12, 2021, 1:39pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/13 "2021-08-12T13:39:19Z")
PR is ready for this issue. > > > Initialize the Jekyll project for development. @jaye@Gravewalker Please review it and let me know if there is anything that needs to be changed. ---
**Author:** ![Gravewalker](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/gravewalker/32/12_2.png) [@Gravewalker](https://sef.discourse.group/u/Gravewalker)\ **Post date:** [August 14, 2021, 3:54am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/14 "2021-08-14T03:54:23Z")
@Pasindu_Rupasinghe use this url to get the profiles [https://sef-global.github.io/dev-welcome-pr/developers.json](https://sef-global.github.io/dev-welcome-pr/developers.json) ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 17, 2021, 6:55am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/15 "2021-08-17T06:55:07Z")
Okay, @Gravewalker I’m working on that. And I sent a pr to add existing profiles and also to add the pr template. pr link - > > > Add Pull Request template and existing developer profiles. ---
**Author:** ![Gravewalker](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/gravewalker/32/12_2.png) [@Gravewalker](https://sef.discourse.group/u/Gravewalker)\ **Post date:** [August 17, 2021, 7:35am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/16 "2021-08-17T07:35:55Z")
Nice work @Pasindu_Rupasinghe lemme create the issues for you. Maybe we might have to break this up to two different PRs?? ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 17, 2021, 8:18am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/17 "2021-08-17T08:18:20Z")
Okay @Gravewalker . I think it would be better. ---
**Author:** ![jaye](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/jaye/32/810_2.png) [@jaye](https://sef.discourse.group/u/jaye)\ **Post date:** [August 19, 2021, 8:32am UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/18 "2021-08-19T08:32:48Z")
Merged! Thanks @Pasindu_Rupasinghe ! We need to update the readme guiding them on how to create the welcome PR. ---
**Author:** ![Pasindu\_Rupasinghe](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/pasindu_rupasinghe/32/612_2.png) [@Pasindu\_Rupasinghe](https://sef.discourse.group/u/Pasindu_Rupasinghe)\ **Post date:** [August 20, 2021, 2:18pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/19 "2021-08-20T14:18:53Z")
Your welcome @jaye. Thank you for reviewing those prs. @Gravewalker Would you be able to create issues for, 1. Update redeme file with guidance in [sef-global](https://github.com/sef-global)/ **[dev-welcome-pr](https://github.com/sef-global/dev-welcome-pr)**. 2. Update pull request template in [sef-global](https://github.com/sef-global)/ **[sef-dev](https://github.com/sef-global/sef-dev)**. I think that’s all that I have to do with this task. Please let me know if there are any other tasks that need to be completed. ---
**Author:** ![jaye](https://yyz2.discourse-cdn.com/free1/user_avatar/sef.discourse.group/jaye/32/810_2.png) [@jaye](https://sef.discourse.group/u/jaye)\ **Post date:** [August 20, 2021, 4:32pm UTC](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338/20 "2021-08-20T16:32:30Z")
Good job so far, Mr. Siri! You can go ahead and create those issues. Other things might be, adding the content to the page such as blogs, our repos and stuff. @Gajindu_Bandara you may switch the IRC task with Pasidu if you like. I think it might be effective because Pasindu is comfortable with IS related stuffs and you are comfortable with dynamic contents. [Next page](https://sef.discourse.group/t/avoiding-conflicts-in-welcome-prs/338.md?page=2)