archivematica icon indicating copy to clipboard operation
archivematica copied to clipboard

Email fail report values swap, ref #802

Open melaniekung opened this issue 2 years ago • 1 comments

Connected to https://github.com/archivematica/issues/issues/802

  • Total file size
  • Number of files

melaniekung avatar Mar 22 '22 15:03 melaniekung

We also always merge changes into qa/1.x, and then cherry-pick them back to stable if needed. I've changed the target branch here to qa/1.x and you'll see there's a lot of noise - in order to get rid of that, you'll need to rebase your development branch on current qa/1.x. You can do that by doing:

git checkout qa/1.x
git pull
git checkout dev/issue-802-email-fail-report-values-swap
git rebase qa/1.x

Then if everything looks good and there are no merge conflicts, force-push your newly rebase dev branch:

git push -f origin dev/issue-802-email-fail-report-values-swap

tw4l avatar Mar 22 '22 16:03 tw4l