search

dscgt / recycling_website

Admin website for GT OSWM&R.
0 stars 0 forks source link

Add Validators.required validation #43

Closed shreyasanthana closed 3 years ago

shreyasanthana commented 3 years ago

Add reactive form validators to files that already have template form validation to prevent future bugs.

michaelyfan commented 3 years ago

It looks like you've put these changes on top of an old branch which has already been merged and previously deleted. no-duplicates has six commits that already exist in master, and only one of those commits is yours.

Could you make a new branch based on the latest master, and then put your changes in there? After making the new branch, you don't have to rewrite everything, just cherry-pick your existing commit (git cherry-pick --no-commit 5e428c5a4352b46ab73655475a6b9499bac8fae2). This will place your changes from only one commit onto your local. Make sure everything looks good, then you can commit and push as usual.

I'm welcome to walk you through this. Try to work off of only new branches based off of latest master in the future.

michaelyfan commented 3 years ago

Closing, the new branch and PR without merge conflicts is https://github.com/dscgt/recycling_website/pull/52