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; } } }

Error while merging two branch which has files with same name Please help

image2014-10-8 16:59:13.png

image2014-10-8 16:59:13.png

Accepted answers

All comments

Balázs Szakmáry

You need to resolve the merge conflict locally, not on the server.

Welcome!

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

Quick Links

Find more posts tagged with

sourcetree

git

merge