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

Git Flow finishing a release with conflict upon merge.

Sylvain Picory

Hi everyone,

I would like to know what the best way to resume the Finish Feature functionnality after resolving all conflicts happening during the merge?

Thanks

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

git

git-flow

merge

conflict