search

ubsuny / 23-Homework4G4

MIT License
0 stars 10 forks source link

Editing file in the main repo. #64

Open pratibha77118 opened 1 year ago

pratibha77118 commented 1 year ago

@laserlab Professor, I got these conflicts while merging the files. Am I allowed to edit the files on main repo (as a maintainer) to resolve this conflicts. I am going to edit the file I merged earlier so that that conflicts might be resolved.

Module file module2
laserlab commented 1 year ago

Sounds good. Part of the job of a maintainer is to resolve merge conflicts