Closed Mefodei closed 4 years ago
@Mefodei this branch has conflicts that must be resolved.
Please merge with the latest master then resolve the conflict.
# Sync local/master with upstream/master
git remote add upstream git@github.com:favoyang/unity-addressable-importer.git
git fetch upstream
git checkout master
git merge upstream/master
# Merge master to your branch
git checkout YOUR_WORKING_BRANCH
git merge master
# solve the conflict, then commit.
Please merge with the latest master then resolve the conflict.
# Sync local/master with upstream/master git remote add upstream git@github.com:favoyang/unity-addressable-importer.git git fetch upstream git checkout master git merge upstream/master # Merge master to your branch git checkout YOUR_WORKING_BRANCH git merge master # solve the conflict, then commit.
Done
:tada: This PR is included in version 0.9.0 :tada:
The release is available on GitHub release
Your semantic-release bot :package::rocket: