How to fix merge conflicts in PRs?

🤗Datasets
1

Hi all,

I have a PR open on a dataset that has conflicts with the main branch (FBK-MT/mosel · Granary). Unfortunately, I cannot handle the repo using git as there is a logo in the readme and when I try to push from git I get:

remote: -------------------------------------------------------------------------
remote: Your push was rejected because it contains binary files.
remote: Please use https://git-lfs.github.com/ to store binary files.
remote: See also: https://hf.co/docs/hub/repositories-getting-started#terminal
remote: 
remote: Offending files:
remote:   - mosel-logo-transparent.png (ref: refs/tags/v1.1)
remote: -------------------------------------------------------------------------

So I am not sure how to handle this. Is there any way to solve merge conflict with the UI or the HfApi? Do you have any suggestions?

Thanks!

2

I’m not familiar with git, but this case seems similar…

3

Yes, that is the problem I get with git. The problem is that the solution requires rebuilding the repo from scratch. That is why I was looking for a way to solve conflicts from the UI of HfApi. Thanks.

4

Ah, I see. In that case, this function might be the closest option. If you set create_pr to True, it will probably become a PR waiting to be merged, so even if something goes wrong, there shouldn’t be any problems.

5

I already have a PR open, the problem is that it has merge conflicts and I do not know how to solve them.

6

It seems that the only option available with hub Python library is to close the commit and make another commit…

7

I see, that was my fear… that’s quite unfortunate as someone has to redo everything from scratch. Hope in the future there will be better options. Thanks for your replies.