Git Resolve Conflicts In Pull Request | Git Conflicts | Git Merge Conflicts

For Online/Classroom training and project support please contact
Java Home Cloud, Banglore India
[phone]

[ihioloj]

I manage to resolve conflicts very quickly. This is exactly what I needed! Thanks

[duvvuindirapriya]

You are God of git to me . Thankyou so much 😭😭😭😭. I struggled almost for 3 months finally. It was clearly explained 🥺🥺🥺🥺🥺.

[ravi]

exactly to the pin point ... you have saved me literally from the big trouble sir... keep posting such videos it very helpful for developers

[CandraNurIhsan]

The over powered Indian tech YouTubers... Nicee

[abhishekpatil]

After watching hours of other videos for this topic finally got the Bulls eye hit by you in this video. Thank you sir.

[akhil]

Thanks, you helped for me an early sleep today :)

[RELC]

Thanks! Straight to the point unlike other videos.

[yasararafath]

your example really helped. thank you so much

[AhmedAlbadwi]

You have the art of making difficult things sound easy

[AnandSingh-misv]

Thank you so much, was looking for the exact explanation where I was confused about...

[pcimring]

Exactly what I was looking for! Great job!

[sandeeppetkar]

Thanks a lot, you have really explained it very well and in very easy way.
Can you please post a video on how to resolve conflicts using cherry-pick

[olaorefouad]

this was incredibly helpful!, thank you!

[ravindrashilpi]

Thanks, Really such a nice explanation.

[kalyankalapala]

Incredible. Thank u for great demonstration

[mgksmv]

Great explanation, thanks a lot! Now I can sleep in peace :)

[jayendrasingh]

Thank you so much for your to the point solution

[rafilla]

Thanks for the explanation, it is exactly what I needed

[ashishniranjan]

Thank you for sharing this topic.
I need help on same, I got query:

Scenario is :
1. There is Repo1 in bitbucket
2. There is the master branch
3. There are multiple other branches examples demobranch1, demobranch2, etc..
4. I have to merge changes to demobranch1
5. I have a clone master branch in my local and updating repo
6. I have checkout to demobranch1
7. Then I have created a new branch demobranch2 in my local and checkout to demobranch2
8. Now when I am pushing changing to demobranch2, I am getting the error(This is problem 1)
9. I tried to pull from the master but the issue not resolved
10. the moment I tried to pull from demobranch2 to my local, many changes happen to the repo and the same changes happened in bitbucket as well for the same branch. (THis is 2nd big problem)

Could you please help me with how to resolve these two problems?
So that I can push my changes without conflict and bit bucket repo also come back to its original state atleast.

[calderov]

Thanks man, this is a great explanation.