Rebase conflicts only in github actions

[MartinX3]

Example: https://github.com/MartinX3-AndroidDevelopment-LineageOS/android_device_sony_pdx201/tree/MartinX3/github-actions

If I use checkout and then a rebase or a git pull --rebase or anything else which does a merge/rebase I run into a merge conflict.

Doing the same on my local computer (using git clone insteaf of actions/checkout of course) I don't get any merge conflicts.

[MartinX3]

Fixed by using

- uses: actions/checkout@v2
  with:
    fetch-depth: 0

#265 (comment)

For improved perf, v2 only fetches a single commit by default. If you set fetch-depth: 0 then will fetch all history for all branches and tags and the short sha will probably work. Otherwise need to specify the full SHA.

I hope others with the same problem will find this issue ticket and the solution.