GSSoC24
facing merge conflicts but can not resolve it , as my resolve button is disable #817
-
|
|
Beta Was this translation helpful? Give feedback.
Replies: 3 comments 33 replies
-
|
@rounakdey6 can you please mention the issue and also in which project so that we can help you out |
Beta Was this translation helpful? Give feedback.
-
|
Is this you own project ?? |
Beta Was this translation helpful? Give feedback.
-
|
@AKSHITHA-CHILUKA No , I am a contributor , this project is "yatulearn" |
Beta Was this translation helpful? Give feedback.
-
|
@AKSHITHA-CHILUKA every time i solve an issue , and try to PR , it's showing me this . |
Beta Was this translation helpful? Give feedback.
-
|
You are having merge conflicts and you have to resolve it merge conflicts occur because two people are trying to modify the same part of a file/code. When someone else makes changes to a file (like editing the same lines of code you’re working on), Git gets confused about which version to keep, causing a conflict. To fix this, click on resolve conflicts to solve merge conflicts |
Beta Was this translation helpful? Give feedback.
-
|
i did it , but it didn't help |
Beta Was this translation helpful? Give feedback.
-
|
@rounakdey6 share this pr link if you are still facing the error |
Beta Was this translation helpful? Give feedback.
-
|
You can do on this branch also but better to create a new branch , ensure that you are raising pr in updated branch . |
Beta Was this translation helpful? Give feedback.
-
|
Ok I'm giving it a try , if I face any problem, I will reach out to you |
Beta Was this translation helpful? Give feedback.
-
|
ok no problem , also let me know if your problem is solved. |
Beta Was this translation helpful? Give feedback.
-
|
|
Beta Was this translation helpful? Give feedback.
-
|
Yup it is ready to merge |
Beta Was this translation helpful? Give feedback.
-
|
If few checks were not ticked..Is that possible to merge? @Meetjain1 |
Beta Was this translation helpful? Give feedback.
-
|
Can u share screenshot of that few checks ? @DivyaJyothi9 because it depends on type of checks |
Beta Was this translation helpful? Give feedback.
-
|
|
Beta Was this translation helpful? Give feedback.
-
|
@Meetjain1 Sir, I have shared. |
Beta Was this translation helpful? Give feedback.
-
|
This can be merged , wait for the PA to reply if he suggest some changes do that else no issue |
Beta Was this translation helpful? Give feedback.
-
|
Thank you so much @Meetjain1 |
Beta Was this translation helpful? Give feedback.
You are having merge conflicts and you have to resolve it
merge conflicts occur because two people are trying to modify the same part of a file/code. When someone else makes changes to a file (like editing the same lines of code you’re working on), Git gets confused about which version to keep, causing a conflict.
To fix this,
Make sure your branch is up to date with the main branch.
You can do this by syncing your fork (or pulling the latest changes from the main branch).
Once your branch is updated, you can safely make your changes without conflicts.
click on resolve conflicts to solve merge conflicts