Merged
Conversation
Xeramian
approved these changes
Feb 22, 2026
nilotpal-n7
approved these changes
Mar 9, 2026
Member
|
Resolve the conflicts then push (bash) git fetch upstream && git merge --no-commit --no-ff upstream/main(powershell) git fetch upstream; git merge --no-commit --no-ff upstream/mainif everything passes then: git merge --abortif conflicts then you could either fix them then: git add .
git commit
# or just:
git merge --abort |
Opening application list on clicking mess rebate on home page
isUploadable, sent though backend, or calculation is possible in frontend. if not possible, have to integrate in mongdb, or attached in my-application while sending to client-side. Else, everything is woring perfectly
This reverts commit df04dab.
This reverts commit 5cf7fee.
…nknown" being displayed
Implement new Account Screen, HMC details, and Feedback page.
…lsory in bugreport form
MessRebate Major Progress
Add skeletal loader with shimmer in HMC details page, make desc compu…
Using upload.fields. Late uploading of medical certificate still uses legac code for uploading files.
Modified fields to accomodate frontend field names. Created another field in leaveModel.js for leaveDocument. Modified notification texts for approval and rejection of leave application Integration of HABit HQ is still remaining
QR scan screens
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.