[FIX] move fast-forward pull before changes to avoid conflict#376
Merged
nerdalert merged 1 commit intoinstructlab:mainfrom Nov 26, 2024
Merged
Conversation
Signed-off-by: greg pereira <grpereir@redhat.com>
Gregory-Pereira
force-pushed
the
fix-pr-images-workflow-v3
branch
from
e0d79f6 to
1205b37
Compare
nerdalert
approved these changes
Nov 26, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The issue with this was that I was modifying the manifests with the pr tag before
pulling to fast forward and pick up any other CI changes. Here is an example log:From: https://github.com/instructlab/ui/actions/runs/12016449930/job/33496664430#step:16:40.
This PR moves the
git pull --ff-onlybefore the code changes so there should be no working changes in the tree to cause conflicts.cc @nerdalert @vishnoianil