Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Appraisal Overview report (backport #423) #425

Merged
merged 8 commits into from
Mar 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 31, 2023

This is an automatic backport of pull request #423 done by Mergify.
Cherry-pick of bcdbb78 has failed:

On branch mergify/bp/version-14-hotfix/pr-423
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bcdbb787.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/workspace/performance/performance.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit d1c35ab)
(cherry picked from commit 5c9b91e)
(cherry picked from commit bcdbb78)

# Conflicts:
#	hrms/hr/workspace/performance/performance.json
@mergify mergify bot requested a review from ruchamahabal as a code owner March 31, 2023 05:01
@mergify mergify bot added the conflicts label Mar 31, 2023
@ruchamahabal ruchamahabal merged commit 9db36d5 into version-14-hotfix Mar 31, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-423 branch March 31, 2023 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant