You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
We would like to change the branch of the source repository to sync from
Use Case
We use a version branch v1 in our source (template) repo to be able to handle breaking changes there. Now we figured out that we can only merge the main source branch in the action.
We use a dirty workaround and "misuse" the existing git_remote_pull_params parameter : v1 --allow-unrelated-histories --squash --strategy=recursiv e -X theirs
Better would be to add a new optional parameter like source_branch (default '') which can be used like eval "git pull ${source_repo} ${source_branch} --tags ${git_remote_pull_params}" || pull_has_issues=true
Hi @msiebeneicher and thanks a lot for the suggestion.
Actually the idea behind the git_remote_pull_params are also to include possible branches there.
But ok out of convenience reasons I think it makes sense.
Describe the feature
We would like to change the branch of the source repository to sync from
Use Case
We use a version branch
v1
in our source (template) repo to be able to handle breaking changes there. Now we figured out that we can only merge the main source branch in the action.https://github.com/AndreasAugustin/actions-template-sync/blob/main/src/sync_template.sh#L275
Proposed Solution
We use a dirty workaround and "misuse" the existing
git_remote_pull_params
parameter :v1 --allow-unrelated-histories --squash --strategy=recursiv e -X theirs
actions-template-sync/src/sync_template.sh
Line 59 in bcb9441
Better would be to add a new optional parameter like
source_branch
(default '') which can be used likeeval "git pull ${source_repo} ${source_branch} --tags ${git_remote_pull_params}" || pull_has_issues=true
https://github.com/AndreasAugustin/actions-template-sync/blob/main/src/sync_template.sh#L275
Acknowledgements
The text was updated successfully, but these errors were encountered: