Thanks for the help earlier. Just now, I was experimenting with the

lakectl fs upload

command. I was hoping it can allow me to commit parts of the changes to a repo instead of all changes all at once, as I would do via

lakectl local commit

.

lakectl fs upload

did allow me to upload changes to a single file -- I suppose it will allow me a single directory also. I also manged to commit the changes with

lakectl commit

. However, now if I run

lakectl local status

, I get a "conflict" tag with the changed file, which I am unable to resolve. It looks like this.

╔════════╦══════════╦═══════════╗
║ SOURCE ║ CHANGE   ║ PATH      ║
╠════════╬══════════╬═══════════╣
║ local  ║ conflict ║ file2.txt ║
║ local  ║ added    ║ file3.txt ║
╚════════╩══════════╩═══════════╝

In my experiment, I modified

file2.txt

and added

file3.txt

. But I only ran

lakectl fs upload <URI> -s file2.txt

, followed by

lakectl commit -m

. How do I now resolve the conflict? I suppose I need to somehow sync the commit ID in the server with the

.lakefs_ref.yaml

file?