need help with conflict in pr #2267
-
|
|
Beta Was this translation helpful? Give feedback.
Answered by
MastanSayyad
Oct 25, 2024
Replies: 2 comments 1 reply
-
|
@Sohini-Ghosh2004 You can keep the conflict. Since multiple people are opening PRs there will be a merge conflict. The GSSoC team will resolve the conflicts. |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
@Sohini-Ghosh2004 Fixed and merged you PR |
Beta Was this translation helpful? Give feedback.
1 reply
-
|
ok. thanks. |
Beta Was this translation helpful? Give feedback.
Answer selected by
Sohini-Ghosh2004
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
@Sohini-Ghosh2004 Fixed and merged you PR