Use stable version of release tooling (#1558): 6031d2a9
Resolving conflicts
To resolve any conflicts, check out the temporary branch and run the following command:
git merge v1.19
Ignoring changes
To ignore from the remote branch, first reset the temporary branch to v1.19 and manually merge using the `ours` merge strategy:
git reset --hard v1.19
git merge --strategy=ours v1.18
Then, push the temporary branch to upate the pull request.
Merge new changes from v1.18 into v1.19.
Commits
To resolve any conflicts, check out the temporary branch and run the following command: git merge v1.19Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v1.19 and manually merge using the `ours` merge strategy: git reset --hard v1.19 git merge --strategy=ours v1.18 Then, push the temporary branch to upate the pull request.Ignoring changes