WIP: Draft: Resolve "[CI] Use BrowserStack for Selenium tests" #137

Draft
nik wants to merge 1 commit from 23-ci-use-browserstack-for-selenium-tests into master
nik commented 2021-03-30 13:31:30 +02:00 (Migrated from edugit.org)

Closes #23

Closes #23
nik commented 2021-03-30 17:00:52 +02:00 (Migrated from edugit.org)

added 1 commit

  • 652ad374 - [CI] Use BrowserStack for Selenium tests

Compare with previous version

added 1 commit <ul><li>652ad374 - [CI] Use BrowserStack for Selenium tests</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/33/diffs?diff_id=6562&start_sha=e2f8decfd3f151d31d0462bbeb0691f06c37d564)
This pull request has changes conflicting with the target branch.
  • ci/test/test.yml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 23-ci-use-browserstack-for-selenium-tests:23-ci-use-browserstack-for-selenium-tests
git switch 23-ci-use-browserstack-for-selenium-tests

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff 23-ci-use-browserstack-for-selenium-tests
git switch 23-ci-use-browserstack-for-selenium-tests
git rebase master
git switch master
git merge --ff-only 23-ci-use-browserstack-for-selenium-tests
git switch 23-ci-use-browserstack-for-selenium-tests
git rebase master
git switch master
git merge --no-ff 23-ci-use-browserstack-for-selenium-tests
git switch master
git merge --squash 23-ci-use-browserstack-for-selenium-tests
git switch master
git merge --ff-only 23-ci-use-browserstack-for-selenium-tests
git switch master
git merge 23-ci-use-browserstack-for-selenium-tests
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS!137
No description provided.