├── .github ├── scripts │ └── resolve_conflicts.py └── workflows │ └── auto-resolve.yml └── README.md /.github/scripts/resolve_conflicts.py: -------------------------------------------------------------------------------- 1 | import re 2 | 3 | def resolve_conflicts(file_path): 4 | with open(file_path, 'r') as file: 5 | content = file.read() 6 | 7 | # Match Git conflict markers 8 | conflict_pattern = r"<<<<<<< HEAD(.*?)=======\n(.*?)>>>>>>>.*?\n" 9 | 10 | # Resolve by merging unique lines from both sides 11 | def conflict_resolver(match): 12 | head = match.group(1).strip().split('\n') 13 | incoming = match.group(2).strip().split('\n') 14 | merged = sorted(set(head + incoming)) # Remove duplicates and sort 15 | return '\n'.join(merged) 16 | 17 | resolved_content = re.sub(conflict_pattern, conflict_resolver, content, flags=re.S) 18 | 19 | with open(file_path, 'w') as file: 20 | file.write(resolved_content) 21 | 22 | # Path to participants list 23 | resolve_conflicts('README.md') 24 | -------------------------------------------------------------------------------- /.github/workflows/auto-resolve.yml: -------------------------------------------------------------------------------- 1 | name: Auto-Resolve Markdown Conflicts 2 | 3 | on: 4 | pull_request_target: 5 | types: [opened, synchronize, reopened] 6 | 7 | jobs: 8 | resolve-conflicts: 9 | runs-on: ubuntu-latest 10 | steps: 11 | - name: Checkout code 12 | uses: actions/checkout@v3 13 | with: 14 | ref: ${{ github.event.pull_request.head.ref }} 15 | 16 | - name: Auto-Resolve Conflicts 17 | run: | 18 | python .github/scripts/resolve_conflicts.py 19 | 20 | - name: Commit resolved file 21 | run: | 22 | git config --global user.email "actions@github.com" 23 | git config --global user.name "GitHub Actions" 24 | git add participants.md 25 | git commit -m "Auto-resolved markdown conflicts" 26 | git push 27 | continue-on-error: true 28 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | q# GDGPR Activity 2 | 3 | ## Participants 4 | 5 | | Name | USN | 6 | |--------------------|---------------| 7 | | Suhas A | 1DA22CS165 | 8 | | Sujan P | 1DA22CS167 | 9 | | Prajwal Salgar | 1DA24EC100 | 10 | | Ramya S Gouda | 1DA24EC116 | 11 | | Sharan Reddy M | 1DA22CS145 | 12 | | Rajeshwari | 1TU24EC112 | 13 | | Moghitha B | 1DA23CS111 | 14 | | Nithyashree HN | 1DA23CS210 | 15 | | Dhamini A | 1DA23CB016 | 16 | | Grishma Harisha | 1DA23CB020 | 17 | | Anuj Kumar | 1DA23AI005 | 18 | | Lekhana C R | 1DA23CS089 | 19 | | Manushree S | 1D23CS108 | 20 | | Sanika S | 1DA24EC129 | 21 | | Sneha K | 1TU24IS097 | 22 | | Sujan Bhatti | 1TU24CS197 | 23 | | Gagana Shri RK | 1TU24IS030 | 24 | | Hrishvith C | 1DA23IS016 | 25 | | Sourya Raj | 1TU24IS100 | 26 | | Harshit Raj | 1TU24IS036 | 27 | | Keshav V | 1DA23CS077 | 28 | | Likitha B Poojar | 1DA22EC068 | 29 | | P Gururaj | 1TU24CS115 | 30 | | Sudarshan Pai | 1DA23IS050 | 31 | | Safiya Samreen | 1TU24CB038 | 32 | | Chaya | 1TU24IS022 | 33 | | Sanketh K T | 1TU24CB041 | 34 | | Harshith Gowda G S | 1TU24EC050 | 35 | | Dharmik S Shetty | 1TU24CS055 | 36 | | Rajath H Kashyap | 1DA23CS142 | 37 | | Fasiha B | 1DA23EC041 | 38 | |Dharshan Kumar B|1DA23CS050| 39 | | Rohan G Figredo | 1TU24CS156 | 40 | |V Monisha |1DA23IS054 | 41 | | Dharmik S Shetty | 1TU24CS055 | 42 | | Pragya Pandey | 1TU24CB028 | 43 | |Yashwanth H N| 1da23is062| 44 | | Subham Ghosh | 1DA23IS048 | 45 | | Vedashree V K | 1DA23IS055 | 46 | | Sai keerthan S | 1TU24ET044 | 47 | | Abhishek Bharadwaj| 1DA23IS001 | 48 | |Pallavi N|1TUCS119| 49 | | Bhawna DS | 1TU24IS017 | 50 | |Kalyani s | 1TU24IS041| 51 | | Lekhana.M | 1TU24IS048 | 52 | | Manish P|1DA23CS103| 53 | |Akshay R| 1TU24CS019 | 54 | |Disha.E.G | 1DA23EC038 | 55 | | Harsh Singh | 1DA23AI018 | 56 | |Prashant Kumar|1DA24CS409 | 57 | | Abhishek M Shivanagoudar| 1TU24CS004| 58 | |Chengumani M R|1DA24CS405| 59 | |Yeshwanth V|1DA24CS418 | 60 | | Shivam Mahanteshayya Hiremath| 1TU24CS177| 61 | | Sanjana Yankanchi| 1DA23EC138| 62 | |Ritesh M H|1DA23IS037| 63 | | Vinith Didgi | 1TU24IS405| 64 | | Latha M| 1DA23CS088 | 65 | |Saheel P | 1DA23AI042 | 66 | |Madhumithaa N|1TU24IS050| 67 | |kalyani s|1TU24IS041| 68 | | Chaitra R| 1TU24CS040| 69 | |suchitra m| 1TU24IS101| 70 | |pallavi s| 1DA23CS088 71 | |Pallavi S| 1DA23CS118| 72 | |Dhaarini Vigneswaran | 1DA23CS212| 73 | |Varsha R |1DA24CS415| 74 | |Vivek V Hegde | 1DA23IS060 | 75 | |Shankuntala m| 1DA23ET045| 76 | |Anvitha M Nayak| 1DA23ET004 | 77 | |Amrutha Varshini K S| 1DA23EC010 | 78 | |Deeksha D| 1TU24IS026 | 79 | |Krupa B U| 1TU24CS085| 80 | | Kavya Moodi| 1DA23CS203| 81 | | Inchara JK| 1TU24CS075| 82 | | vivek v hegde | 1DA23IS060| 83 | | Namratha H L | 1TU24IS061 | 84 | |manasa R V| 1DA23EC079| 85 | | vivek v hegde | 1DA23IS060| 86 | | Chaitra R| 1TU24CS040 | 87 | |Yallamma B|1DA23ET061| 88 | | Chaitra R| 1TU24CS040 | 89 | |Lavanya s|1TU24IS047| 90 | |Fathina |1DA23ET041| 91 | | Manjesh ck | 1TU24IS402| 92 | |Mallikarjuna.C| 1DA23AI025| 93 | | M R Suhas | 1DA23EC084 | 94 | | Faiza Banu| 1TU24EC035| 95 | | Gagan nagathan |1DA23EI015 | 96 | | Meghana N| 1TU24CS097 | 97 | | Keerthana nh| 1DA23CS209 | 98 | | Sanvi Y Gowda | 1TU24CS165 | 99 | | preethu D R | 1DA23ET039 | 100 | |Geethanjali K Y| 1TU24IS031| 101 | | Shreepriya--Tariwal | 1DA24EC141 | 102 | | Vijayalakshmi R | 1TU24EC172 | 103 | | Inchara CR | 1TU24CS074| 104 | | basawaraj |1DA23EC022| 105 | |Sinchana Narasimha Murthy|1TU24CS187 | 106 | 107 | ### Instructions 108 | Please add your name and USN to the fork and submit a pull request. 109 | 110 | 111 | --------------------------------------------------------------------------------