Conflict resolution bitbucket

How do I resolve a pull request conflict?
Resolve conflicts in a pull request (console)
1. In Repositories, choose the name of the repository
2. In the navigation pane, choose Pull requests
3. By default, a list of all open pull requests is displayed
4. In the pull request, choose Resolve conflicts
What is conflict resolution in Git?
Luckily, Git offers powerful tools to help navigate and resolve conflicts.
Git can handle most merges on its own with automatic merging features.
A conflict arises when two separate branches have made edits to the same line in a file, or when a file has been deleted in one branch but edited in the other..
During a merge Git will automatically resolve as many conflicts as possible and write the MERGED file containing conflict markers around any conflicts that it cannot resolve; LOCAL and REMOTE normally represent the versions of the file from before Git's conflict resolution.

Make sure you're in your repository directory.
Pull the most recent version of the repository from Bitbucket.
Checkout the source branch.
Pull the destination branch into the source branch.
Open the file to resolve the conflict.
Resolve the conflict by doing the following:
Add and commit the change.

When you create a pull request Bitbucket automatically compares the source with your update and the destination with the original code. If anyone else has made changes in the destination to the same code you touched, we'll notify you of conflicts when you attempt to merge.

Checkout The Temporary Branch with Your changes.

This branch is created, when there are detected conflicts with your origin branch which are not possible to resolve with auto-merging .

Commit Resolved Files

If you commit your resolved files you are in the detached branch so you have to push it to your branch.

How do I fix a Git conflict in Bitbucket?

Now fix the conflicts.
Stage the changed files with 'git add' or 'git stage'.
Commit the changes to the feature branch with 'git commit -m [your commit message]'.
Push the changes to the remote with 'git push origin feature/ [my branch description]'.
Start a new pull request in Bitbucket with the URL provided in the response message.

How do I resolve a conflict in a merged branch?

When you merge two branches with conflicts locally, you'll get conflict markers in the file when you open your editor.
Open the file to resolve the conflict.
You can do this using the command line or you can navigate to the file.
Add and commit the change.
Push the change to the remote.

How to merge a pull request on Bitbucket Server?

On BitBucket server, when we get any conflict while merging any pull request, we can use git bash tool to resolve it on our local system and then we can commit and push our changes to remote feature branch and merge it to main branch.
Following steps need to be followed in order in our local system’s git bash tool.

How to resolve a command line conflict in idea?

Through the branches menu on the bottom right -> choose feature branch -> Merge into current (development), resolving conflicts - and nothing shows on changelist! nothing to commit and push..
As I explained, none reproduce the steps for command line conflict resolution as bit bucket explains.
So how to do this correctly in IDEA? .

Merge Destination Branch to Your Detached Branch.

This command will merge all files which can merge.
In others, there are marked lines of code, which have to be merged manually

Resolve Conflicts

Compare yours and incoming changes and resolve them.
If you have finished, you can mark the resolved file with git add.