I'm trying to take merge from one branch to my own branch.
When I give Merge in to Current Branch, It shown me the Conflicts but I was not able to resolve the conflicts and my changes all are gone. #
So I chose to revert the changes in Github. That also not able to do.
The other branch guy (Which I chose to merge in mine) got the Conflicts screen and her changes gone with my updates..
This happened in only one file. But other files got updated correctly.
We all have the .gitignore and .gitattributes file in our folder.
Do we need to have any other files like these in order to resolve this merge this issue?
Please help me in this regards
Hi,
I'm trying to take merge from one branch to my own branch.
When I give Merge in to Current Branch, It shown me the Conflicts but I was not able to resolve the conflicts and my changes all are gone. # So I chose to revert the changes in Github. That also not able to do.
The other branch guy (Which I chose to merge in mine) got the Conflicts screen and her changes gone with my updates.. This happened in only one file. But other files got updated correctly.
We all have the .gitignore and .gitattributes file in our folder.
Do we need to have any other files like these in order to resolve this merge this issue? Please help me in this regards
Thanks in Advance -SSC Team