Closed 31adityakumar closed 1 year ago
Pull the home-page
branch in your local repo and then merge in your trending
branch and then resolve the merge conflicts and then push the changes in your trending
branch and then push it
Steps: (Make sure you are in trending
branch locally)
git pull --all
git merge home-page
Resolve all the merge conflicts
git add .
git commit -m "MERGE: Conflicts resolved"
git push origin trending
These steps are to be perform each time you create a PR. Also github actions alerts you about the merge conflicts.
More changes
px
in your scss because that's specific for devices. Use relative units like vh
, vw
or percentages.As it is in the design
After pulling from home-page
branch you will find a directory
public/images/
Then move all your images you have used into this directory and then use those images from here. Then delete your
public/Images/
directory
The design of Trending
Component doesn't match with the design provided by the UI/UX Team
Your design
Design provided
Try this structure for your markup
✅ Deploy Preview for guidance-grid-nits ready!
Toggle QR Code...
Use your smartphone camera to open QR code link.
To edit notification comments on pull requests, go to your Netlify site settings.