ThreeTAG-Legacy/SpeedsterHeroes
ThreeTAG-Legacy/SpeedsterHeroes
2
0
Fork 0
Code Issues 2 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Update cw_black_flash.json #6

Open
ToastGun wants to merge 4 commits from patch-2 into 1.12.2-2.0
pull from: patch-2
merge into: ThreeTAG-Legacy:1.12.2-2.0
Conversation 3 Commits 4 Files changed 4 +4 -4
ToastGun commented 2020-08-13 21:58:42 +00:00 (Migrated from gitlab.com)
Copy link
No description provided.
ToastGun commented 2020-08-13 22:03:16 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ca3fa8cd - Update cw_savitar.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/3/diffs?diff_id=106312048&start_sha=818f8c9768a76b19a9e802bc9088d12f4f9a4158)
ToastGun commented 2020-08-13 22:04:24 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9f7a98d7 - Update cw_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/3/diffs?diff_id=106312157&start_sha=ca3fa8cddc96f8d0a26877ae46e78c7f4a658658)
ToastGun commented 2020-08-13 22:05:03 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>132734dd - Update cw_reverse_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/3/diffs?diff_id=106312208&start_sha=9f7a98d7c43a04a440004cbed065dc6f4760d42d)
This pull request is broken due to missing fork information.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin patch-2:patch-2
git switch patch-2

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 1.12.2-2.0
git merge --no-ff patch-2
git switch patch-2
git rebase 1.12.2-2.0
git switch 1.12.2-2.0
git merge --ff-only patch-2
git switch patch-2
git rebase 1.12.2-2.0
git switch 1.12.2-2.0
git merge --no-ff patch-2
git switch 1.12.2-2.0
git merge --squash patch-2
git switch 1.12.2-2.0
git merge --ff-only patch-2
git switch 1.12.2-2.0
git merge patch-2
git push origin 1.12.2-2.0
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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
ThreeTAG-Legacy/SpeedsterHeroes!6
No description provided.