Hello! I’m trying to understand how the cool merge strategies feature works. I use the following commands to create a conflict and was hoping adding

--strategy source-wins

would bypass the conflict. Can someone explain if there are some conflicts that adding strategy to won’t be able to bypass?

# create initial file
echo "my name is cheeky, cheeky cheeky cheeky" > file.txt

#branch1
lakectl branch create <lakefs://example-repo/feat-1> -s <lakefs://example-repo/main>

#branch2
lakectl branch create <lakefs://example-repo/feat-2> -s <lakefs://example-repo/main>

# upload
lakectl fs upload <lakefs://example-repo/feat-1/file.txt> -s file.txt

# take commit
lakectl commit <lakefs://example-repo/feat-1> -m "add cheeky"

# new file and upload 
echo "my name is cha cha, klop, klop, cha cha cha" > file.txt

# upload
lakectl fs upload <lakefs://example-repo/feat-2/file.txt> -s file.txt

# take commmit
lakectl commit <lakefs://example-repo/feat-2> -m "add klop"

# merge source into dest
lakectl merge <lakefs://example-repo/feat-2> <lakefs://example-repo/feat-1> --strategy source-wins

Even with the strategy flag the CLI response is still

Source: <lakefs://example-repo/feat-2>
Destination: <lakefs://example-repo/feat-1>
Conflict found.
Error executing command.

This is on a recently created playground environment and lakectl version 0.62.0. Thank you!

Hi Paul, That's strange. I'll try to ask on the team...