oeg-upm / soca

Software Catalog Creator. A repository that given an organization URL, it will create a software catalog for browsing all repositories

Apache License 2.0

12 stars 5 forks source link

Fixing new issues #48

Closed dakixr closed 2 years ago

dakixr commented 2 years ago

36

37

38

39

40

41

42

44

45

47

dakixr commented 2 years ago

I've included all your changes in my commits (Note: for easing the conflicts)

dgarijo commented 2 years ago

This PR is conflicting. Please see the changes in the about page. Probably the ones I did a while ago

dakixr commented 2 years ago

I have included all your changes in my commits

dgarijo commented 2 years ago

No, otherwise I would be able to merge the PR. It tells me that there are 2 files with conflicts: README.md and about.html

dakixr commented 2 years ago

The thing is that I've done it manually. Copying and pasting your changes into my branch, instead of pulling your changes. But I can assure you that in my pull request all your changes are reflected

dgarijo commented 2 years ago

It's not a matter of trust :) It's just that I can't merge the pr: Screenshot from 2022-04-29 11-38-08

I will try to solve the conflicts by hand