Closed asteel-gsa closed 1 month ago
checkout git checkout -b upstream-merge-v2 main-backup where main-backup is a copy of main pulls git pull https://github.com/ajilach/clamav-rest.git master upstream addresses merge conflicts
git checkout -b upstream-merge-v2 main-backup
git pull https://github.com/ajilach/clamav-rest.git master
checkout
git checkout -b upstream-merge-v2 main-backup
where main-backup is a copy of main pullsgit pull https://github.com/ajilach/clamav-rest.git master
upstream addresses merge conflicts