Closed Gregory-Pereira closed 22 hours ago
cc @vishnoianil
basically what is happening, is that the pathservice image bump commit merges, and this causes conflicts for the UI one. There for I added git pull --ff-only to the job to allow it to fast forward to that commit, and avoid conflicts
git pull --ff-only
see example: https://github.com/instructlab/ui/actions/runs/11941765217/job/33287339224#step:16:42
Gregory-Pereira
commented
1 day ago
cc @vishnoianil
basically what is happening, is that the pathservice image bump commit merges, and this causes conflicts for the UI one. There for I added
git pull --ff-onlyto the job to allow it to fast forward to that commit, and avoid conflicts