From b48619078d8dd99533ad096e943ca8f47ea5dc04 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 29 Jul 2025 21:58:14 +0530 Subject: [PATCH 1/2] Update CODEOWNERS (cherry picked from commit b9b3302b69b5d15bb9c4033893d526e67ddb13be) # Conflicts: # CODEOWNERS --- CODEOWNERS | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 4a19fc871b5..5bdc509ad18 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,22 +3,36 @@ # These owners will be the default owners for everything in # the repo. Unless a later match takes precedence, +<<<<<<< HEAD erpnext/accounts/ @deepeshgarg007 @ruthra-kumar erpnext/assets/ @khushi8112 @deepeshgarg007 erpnext/regional @deepeshgarg007 @ruthra-kumar erpnext/selling @deepeshgarg007 @ruthra-kumar erpnext/support/ @deepeshgarg007 pos* +======= +erpnext/accounts/ @ruthra-kumar +erpnext/assets/ @khushi8112 +erpnext/regional @ruthra-kumar +erpnext/selling @ruthra-kumar +erpnext/support/ @ruthra-kumar +pos* @diptanilsaha +>>>>>>> b9b3302b69 (Update CODEOWNERS) -erpnext/buying/ @rohitwaghchaure +erpnext/buying/ @rohitwaghchaure @mihir-kandoi erpnext/maintenance/ @rohitwaghchaure -erpnext/manufacturing/ @rohitwaghchaure +erpnext/manufacturing/ @rohitwaghchaure @mihir-kandoi erpnext/quality_management/ @rohitwaghchaure -erpnext/stock/ @rohitwaghchaure -erpnext/subcontracting @rohitwaghchaure +erpnext/stock/ @rohitwaghchaure @mihir-kandoi +erpnext/subcontracting @mihir-kandoi +<<<<<<< HEAD erpnext/controllers/ @deepeshgarg007 @rohitwaghchaure erpnext/patches/ @deepeshgarg007 +======= +erpnext/controllers/ @ruthra-kumar @rohitwaghchaure @mihir-kandoi +erpnext/patches/ @ruthra-kumar +>>>>>>> b9b3302b69 (Update CODEOWNERS) .github/ @deepeshgarg007 pyproject.toml @akhilnarang From 7489c9159d15f730ef693e1fd7e4eb070adfcde3 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 29 Jul 2025 22:22:25 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- CODEOWNERS | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 5bdc509ad18..a0c68b87789 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,21 +3,12 @@ # These owners will be the default owners for everything in # the repo. Unless a later match takes precedence, -<<<<<<< HEAD -erpnext/accounts/ @deepeshgarg007 @ruthra-kumar -erpnext/assets/ @khushi8112 @deepeshgarg007 -erpnext/regional @deepeshgarg007 @ruthra-kumar -erpnext/selling @deepeshgarg007 @ruthra-kumar -erpnext/support/ @deepeshgarg007 -pos* -======= erpnext/accounts/ @ruthra-kumar erpnext/assets/ @khushi8112 erpnext/regional @ruthra-kumar erpnext/selling @ruthra-kumar erpnext/support/ @ruthra-kumar pos* @diptanilsaha ->>>>>>> b9b3302b69 (Update CODEOWNERS) erpnext/buying/ @rohitwaghchaure @mihir-kandoi erpnext/maintenance/ @rohitwaghchaure @@ -26,13 +17,8 @@ erpnext/quality_management/ @rohitwaghchaure erpnext/stock/ @rohitwaghchaure @mihir-kandoi erpnext/subcontracting @mihir-kandoi -<<<<<<< HEAD -erpnext/controllers/ @deepeshgarg007 @rohitwaghchaure -erpnext/patches/ @deepeshgarg007 -======= erpnext/controllers/ @ruthra-kumar @rohitwaghchaure @mihir-kandoi erpnext/patches/ @ruthra-kumar ->>>>>>> b9b3302b69 (Update CODEOWNERS) -.github/ @deepeshgarg007 +.github/ @ruthra-kumar pyproject.toml @akhilnarang