Hey folks, trying to get my Codex cloud devflow in a relatively self healing-state. Noticing that I frequently run into merge conflicts with things like markdown files, which are generally in the easy-but-not-trivial to fix class of things.
I’m able to setup github actions to launch things like `@codex merge parent branch and address merge conflicts`, however, it looks like the task environment fails when attempting to perform git operations actions(even though the connector is setup). Also, I’m seeing that secrets are only available for the duration of the setup script(post 1266174, but it looks like I can’t link to it here), so I wouldn’t be able to use a personal access token to accomplish this either.
I’m currently able to workaround this by pulling locally, running the equivalent codex prompt locally, and then repushing, but I’d like to not have to do this if possible. Any ideas?
Edit: post 1371830 was able to help unblock a crucial piece. However, I’m running into one last issue in that the Cloud Task is able to pull main and go through the steps of resolving conflicts, however, when clicking “Update PR” a regular commit is generated instead of a merge commit. So history isn’t actually maintained.