nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Pull request merge conflict

Dilpreet Badwal

I do not get conflicts when I branch from master and merge my feature branch to it . But I get conflicts when I raise pull request to merge it to master branch . Can you please let me know how to resolve pull request conflict

Accepted answers

Is your local master branch up-to-date (in sync) with Bitbucket?

All comments

Is your local master branch up-to-date (in sync) with Bitbucket?

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

server

bitbucket

bitbucket-server