Coding-with-Adam
commented
1 year ago hi @tuopouk We actually tried that solution (linked above) the last time you committed the Finland app, but couldn't solve it that way. We ended up deleting the Contributing.md file and re-adding it again.
We can solve it that way again, but my main concern is for future apps and pull requests you open. Right now this PR has 30 commits representing your full history of contributions and commits. This is not normal. Every PR should be a new clean sheet of commits that solely represent the app you are adding. I'm pretty sure it's a problem with the forked repo you have. I would be happy to connect with you on google meet and try to solve this together, so this doesn't repeat itself every time you add a new app in the future.
Let me know what you prefer to do.
@Coding-with-Adam This is an update from a different branch but still has the merge conflict.
BTW, Did you try the method for solving the conflict here? I guess this is something only merger can do.