qur/god
1
0
Fork 0
Code Issues 5 Pull requests 1 Releases Packages 1 Wiki Activity Actions

WIP: factorio_support #11

Draft
inspirius wants to merge 4 commits from factorio_support into master
pull from: factorio_support
merge into: qur:master
Conversation 0 Commits 4 Files changed 10 +619
inspirius commented 2020-03-08 16:14:14 +00:00
Collaborator
Copy link

Initial work on factorio support, ready for some feedback.

Initial work on factorio support, ready for some feedback.
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This pull request has changes conflicting with the target branch.
  • games/factorio/control.bashrc
  • games/factorio/gen-password.sh
  • games/factorio/god.yml
  • games/factorio/tools/create
  • games/factorio/tools/install
  • games/factorio/tools/load
  • games/factorio/tools/save
  • games/factorio/tools/start
  • games/factorio/tools/status
  • games/factorio/tools/stop
View command line instructions

Checkout

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

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 factorio_support
git switch factorio_support
git rebase master
git switch master
git merge --ff-only factorio_support
git switch factorio_support
git rebase master
git switch master
git merge --no-ff factorio_support
git switch master
git merge --squash factorio_support
git switch master
git merge --ff-only factorio_support
git switch master
git merge factorio_support
git push origin master
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
qur
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
qur/god!11
No description provided.