On 12/9/19 7:25 PM, Orion Poplawski wrote:
On 12/7/19 1:53 AM, Mattia Verga wrote:I've also seen that there are some files in the newly created epel8 branch: .cvsignore, Makefile and package.cnf. I would like to do a `git merge master` to sync epel8 branch with fedora rawhide, but doing that would delete these files... do I have to checkout every single files one by one from Rawhide?'git merge master' will not remove or change those files.
Or at least won't remove package.cnf unless you had one in master. I'm not sure what's up with the others.
-- Orion Poplawski Manager of NWRA Technical Systems 720-772-5637 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane [email protected] Boulder, CO 80301 https://www.nwra.com/
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ epel-devel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected]
