Github - GradedJestRisk/cicd-training GitHub Wiki
Use a GitHub Action.
CI should be triggered
- on a pull request
- on merge on default branch
All events to PR are here.
The push on a pull request is the synchronize event, so pull_request covers pretty everything.
Pull request targeting main branch.
on:
pull_request:
branches:
- 'main'Merge (push) on main branch.
on:
push:
branches:
- 'main'3 type:
- rebase
- squash
- merge
A merge commit occurs when you integrate changes from one Git branch into another. This action results in a new commit on the target branch that ties together the histories of both branches. Unlike a rebase or a squash, a merge commit preserves the entire history of both branches, making it easier to understand the context of changes and decisions made throughout the development process.
all commits from the topic branch (or head branch) are added onto the base branch individually without a merge commit. I