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

Is there a methodology for working with git when merges are not possible?

galoni

We want to migrate to git from SVN.

Our artifacts are not mergeable (unsortable XML files from a third party), binaries and images.

Does anyone have an idea on how to coordinate such work?

In SVN we used to lock files.

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

cloud

migration

bitbucket

git

svn

merge