Skip to content

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #38

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@JoelZilli @bruno-zanotti cherrypicking of pull request #38 failed.

stdout:

Auto-merging hr_timesheet_attendance_ux/__manifest__.py
CONFLICT (content): Merge conflict in hr_timesheet_attendance_ux/__manifest__.py

stderr:

13:12:48.666757 git.c:439               trace: built-in: git cherry-pick 0c0d1c15afc939d592a964feddf025b0517264b4
error: could not apply 0c0d1c1... [FIX]hr_timesheet_attendance_ux: change domain in task_id
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants