Rework some steps in resolve-conflicts workflow

[NikitaSkrynnik]

Description

We need to rework this condition in resolve-conflict workflow. This condition checks if the workflow has already tried to resolve conflicts in previous 10 commits. The problem is if a PR has less then 10 commits then the condition also checks main branch. If there are resolved conflicts from other PRs in the main branch they will be taken into account too. Therefore, sometimes this workflow doesn't work because of other PRs.

Issue

networkservicemesh/cmd-forwarder-vpp#1102

Solution

We can use

git log --oneline main..HEAD

to get commits only from the current barnch