As, in bitbucket i am getting conflict in pull request(team branch-> mybranch).
To get it resolve i do simple method of taking latest files from team branch and commit from my branch .but, i also not able to commit and push also.
kindly help me in this please.