PHPORM-185, PHPORM-191, PHPORM-192: Publish SSDLC assets on release (#3004): 42f5a49
Resolving conflicts
To resolve any conflicts, check out the temporary branch and run the following command:
git merge 4.5
Ignoring changes
To ignore from the remote branch, first reset the temporary branch to 4.5 and manually merge using the `ours` merge strategy:
git reset --hard 4.5
git merge --strategy=ours 4.4
Then, push the temporary branch to upate the pull request.
Merge new changes from 4.4 into 4.5.
Commits
To resolve any conflicts, check out the temporary branch and run the following command: git merge 4.5Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to 4.5 and manually merge using the `ours` merge strategy: git reset --hard 4.5 git merge --strategy=ours 4.4 Then, push the temporary branch to upate the pull request.Ignoring changes