SVG files are supported now (closes #28)

COrtsJosep / landscape-aesthetics

This is the repository for our master project!

0 stars 0 forks source link

SVG files are supported now (closes #28) #30

Closed COrtsJosep closed 2 months ago

COrtsJosep commented 2 months ago

What happens if my branch modifies some files that have also been modified in main? Would that cause a conflict?

yujieTao commented 2 months ago

merge If there are some conflicts, the merge pull request will fail and shows conflicts in Merge pull request page. If no conflict, then will shows like the picture