G1 - HR Module#1898
Open
nkg05official wants to merge 32 commits into
Open
Conversation
Collaborator
|
Congratulations for making your first Pull Request at Fusion!! 🎉 Someone from our team will review it soon. |
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
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.
This PR is showing merge conflicts because the target branch has newer changes in some HR module files (
models.py,urls.py,views.py) that overlap with the changes in this PR, so Git is unable to automatically decide which version to keep.In this PR, the old
views.pyandurls.pyfiles outside theapifolder were intentionally removed because we were instructed to shift the implementation into theapistructure. The newer implementation is now inside theapifolder, so the old files are no longer required.To resolve the conflicts and allow automatic merge:
views.pyandurls.pyfiles from the target branch (hr-eis-v1) that are outside theapifoldermodels.pyAfter that, the PR should merge normally without issues.