How to change merge behavior?

A

Artur Zenkov2015-12-12 21:10:23

git

Artur Zenkov, 2015-12-12 21:10:23

The common ancestor of my branches is missing a migration.py file
. The branch I'm about to merge into has one missing too.
It's in my current branch.
Accordingly, when merging, this file is deleted. How to change this behavior?

Reply

Answer the question

In order to leave comments, you need to log in

1 answer(s)

_

_ _, 2015-12-12
@AMar4enko

This can only happen if this file existed in the merged branch, but was deleted. But in this case there will be a conflict. Perhaps the deletion occurs due to automatic conflict resolution. One way or another, after the merge, you will need to commit your change. Before that check back this file and make a commit.