@tassoman opened this Pull Request on June 1st 2020 Contributor

Backporting merge #15583 from 4.x-dev to 3.x-dev.

As superadministrator I would like to compare effective periods (days, weeks, months) instead of data ranges in order to avoid unwanted reports generation

@tsteur commented on June 1st 2020 Member

Thanks for the PR @tassoman . Is it possible to undo the composer changes as part of this PR?

@tassoman commented on June 1st 2020 Contributor

Thank you for the review. I'm sorry for being confused at git. That commit is part of another pull request :unamused:
Maybe happened because I didn't checked out 3.x-dev before committing the code? :thinking:

@tsteur commented on June 1st 2020 Member

Yes you'd probably want to do something like git checkout -b new_branch_name 3.x-dev so it uses 3.x-dev as a base.

@sgiehl commented on June 2nd 2020 Member

You can also try to cherry-pick the original merge commit on a 3.x-dev based branch: git cherry-pick e8cb9c2ae10dceec3fde93acb58569bb8d9c1b59

@tassoman commented on June 3rd 2020 Contributor

Ok. I managed it again, from scratch. Thank you for hinting!

@tassoman commented on June 3rd 2020 Contributor

#16015 for reference

This Pull Request was closed on June 3rd 2020
Powered by GitHub Issue Mirror