Merge Upstream (Cubik65536s Fork)

Version updated for https://github.com/Qubik65536/merge-upstream to version v1.1.3.

  • This action is used across all versions by 4 repositories.

Action Type

This is a Composite action.

Go to the GitHub Marketplace to find the latest changes.

Action Summary

The Merge Upstream GitHub Action automates the process of merging changes from a specified branch of an upstream repository into a target branch of the current repository, using a fast-forward merge strategy. It is particularly useful for keeping forked repositories up to date with their upstream counterparts or synchronizing changes between repositories. This action supports both scheduled and manual triggers, simplifying the workflow for maintaining code consistency across repositories.

What’s Changed

  • Update action.yml (9c056ac)
  • Not fast-forward (solution by @RekGRpth) (3e32aa9)
  • Update action.yml (fd10765)
  • Remove –ff-only (16ca7d9)
  • docs: using token and multiple branch merge (f319e34)
  • feat: add Personal access token (PAT) (16b9d7e)
  • ci: add semantic-release workflow (741e3c2)
  • feat: Able to set upstream and origin branch (814b20b)
  • feat: Change to using composite run instead of Docker (175997d)
  • docs: Improve example and how to run steps (3fdb07b)