search

aviator-co / av

A command line tool to manage stacked PRs with Aviator
https://aviator.co
MIT License
247 stars 14 forks source link

av st sync when on trunk branch #363

Closed oleg-codaio closed 2 months ago

oleg-codaio commented 3 months ago

I found a few smaller issues with the sync workflow when currently on the trunk branch (main for me in my repo).

If I'm on my main branch and run av st sync, I get an error: error: current branch is not adopted to av.

If I run av st adopt, it hangs.

If I run av st sync --all, things mostly work, but av also attempts to force-push the trunk branch, which results in an error: Pushing to main directly is not allowed. because the trunk branch is protected on GitHub.

draftcode commented 2 months ago

If I'm on my main branch and run av st sync, I get an error: error: current branch is not adopted to av.

This should be solved by https://github.com/aviator-co/av/pull/366. Thanks @Brookke.

If I run av st adopt, it hangs.

This will be solved by https://github.com/aviator-co/av/pull/384.

If I run av st sync --all, things mostly work, but av also attempts to force-push the trunk branch, which results in an error: Pushing to main directly is not allowed. because the trunk branch is protected on GitHub.

I'm not sure on this. This indicates that the 'main' was considered as a topic branch rather than a trunk branch. Let me file a separate issue on this. Next time this happens, please save .git/av/av.db so that we can look into the metadata.

draftcode commented 2 months ago

https://github.com/aviator-co/av/issues/386 for the main being pushed problem

draftcode commented 2 months ago

v0.0.40 should include the fixes mentioned above. main being pushed one, please give us details if you have a reproducible setup on the issue link mentioned above. Closing this.