unable to merge branch because of merge conflic, says I need to resolved but unable to

Joey Sanchez January 26, 2023

Hello,

I'm attempting to merge a large branch and I am unable to because of merge conflicts.  I seem to be unable to resolve the merge conflicts at least from Bitbucket but will try to resolve from local repo.  All I know is that I think my branch should overwrite and just straight out merge into master because the master is like older non-relevant when compared to the branch.  Let me know if you need something else.

 

Regards,

Joey

1 answer

0 votes
Joey Sanchez January 26, 2023

Hello,

 

I'm not a git expert, actually I'm kind of dangerous with it.  Boy have I made some mistakes, anyways.  I did try to merge local master into 'deprecated-Clean' branch it says it is, 'Already up to date'.  So, now I wonder why / what is giving me the merge conflict up at Bitbucket.org?  I can I just say to bitbucket.org to just merge that branch into master and to say ignore the conflicts?

Regards,

Joey

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS
AUG Leaders

Atlassian Community Events