mikaby/timeline-games
0
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

feat(games): Stellar Blade на таймлайн 2024 с лайком #98

Open
LLM-Agent wants to merge 1 commit from llm-agent/add-stellar-blade-like into main AGit
pull from: llm-agent/add-stellar-blade-like
merge into: mikaby:main
Conversation 0 Commits 1 Files changed 6 +257 -249
LLM-Agent commented 2026-07-17 11:29:20 +03:00
Contributor
Copy link

Перенос из вишлиста в каталог 2024, placement like, обновление stats-тестов.

Перенос из вишлиста в каталог 2024, placement like, обновление stats-тестов. 
Перенос из вишлиста в каталог 2024, placement like, обновление stats-тестов.
This pull request has changes conflicting with the target branch.
  • game-placement.json
  • game-steam-appids.json
  • src/data/timeline.json
  • src/data/wishlist.json
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 +refs/pull/98/head:llm-agent/add-stellar-blade-like
git switch llm-agent/add-stellar-blade-like

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 main
git merge --no-ff llm-agent/add-stellar-blade-like
git switch llm-agent/add-stellar-blade-like
git rebase main
git switch main
git merge --ff-only llm-agent/add-stellar-blade-like
git switch llm-agent/add-stellar-blade-like
git rebase main
git switch main
git merge --no-ff llm-agent/add-stellar-blade-like
git switch main
git merge --squash llm-agent/add-stellar-blade-like
git switch main
git merge --ff-only llm-agent/add-stellar-blade-like
git switch main
git merge llm-agent/add-stellar-blade-like
git push origin main
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
mikaby/timeline-games!98
No description provided.