I have been working on some changes to a pipeline in a branch. In the interim, other changes have been committed to the Main branch. In prepping for deployment, I am attempting to merge changes from Main into my branch.
However, the merge workflow appears to be preparing to overwrite changes I made to my branch that I want to deploy.
For example, I added a new transform in the pipeline in my branch that does not exist in Main. In the diff shown below, it appears that if I go ahead and merge the changes, the new transform I created will be deleted. Is that an accurate understanding of what’s being presented? How can I select which changes I want to merge in from Main and which ones I want to keep from my branch?
Hey @paulm so just to clarify, you added a new transform that was never on main, but when you merged main in to your branch you get your screenshot above? I’m trying to reproduce what you’re seeing but when I add a new transform I’m not getting the same result.
Normally if there are conflict you’ll see items under the conflict tab on the LHS of the diff view. Is there anything in this tab for you?
Correct. The diff identifies correctly that the transform exists in my branch but not in main, but it is presented as if the transform will be deleted when the merge is completed. When I click through the dialog to resolve merge conflicts, the preview does show my transform still present. So, I think the merge workflow is actually attempting to merge my change, but in the diff it is being presented differently.
