Closed jacelee2000 closed 3 years ago
There are still conflicts
not sure why the file always include the previous version file change. the only file change I want to merge in to origin is file below only. do you able to help me exclude other 3 files?
src/components/CertificateTemplates/tlds/sg/edu/tp/ftpfp/certificateBody.js
I can't do that, it's part of your fork. Your fork is not up to date
You should avoid commit on your master fork without having it up to date. What you can do:
Note that github added a way to sync a fork from the UI recently: (fetch upstream on the right)
noted with thanks. I have follow the step you mentioned. Hopefully it will resolved in the next release. thank you.
name: FTPFP about: This is to include the exemption note for FTPFP template title: "FTPFP" ( this is existing template) labels: FTPFP assignees: ''
Pull Request Guidelines for Adding Certificate Templates
This document is a work in progress but here are some basic checks. As these are only basic guidelines, meeting the below doesn't indicate there will be no issues with your pull request.
Pre-merge checks
npm run lint:fix
to see issues)npm run test
passesnpm run test:integration
passesCertificate Template
recipient
object, etc.