Allow releasing pre-release versions through the release automation (#1590): 2b545c31
Resolving conflicts
To resolve any conflicts, check out the temporary branch and run the following command:
git merge master
Ignoring changes
To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.19
Then, push the temporary branch to upate the pull request.
Merge new changes from v1.19 into master.
Commits
To resolve any conflicts, check out the temporary branch and run the following command: git merge masterResolving conflicts
To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy: git reset --hard master git merge --strategy=ours v1.19 Then, push the temporary branch to upate the pull request.Ignoring changes