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

How can i merge new development branch to existing branch with conflict file.

Ranjithkumar

I clone the code from master branch and named as existing branch.Now i again clone the code from existing branch and named as new branch.I develop existing branch and new branch parallely.Now i can not merge new branch to existing branch due to some conflicts file is there.how can i move it to existing branch with the help of source tree tool.I am using bit bucket and source tree.

Accepted answers

All comments

There are no accepted answers yet

Welcome!

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

Quick Links

Unanswered
Groups
Help

Find more posts tagged with

sourcetree