fdenzer/Mitgliederladen
1
0
Fork 0
forked from mgl_crew/Mitgliederladen
Code Pull requests 1 Activity

main #1

Open
fdenzer wants to merge 46 commits from mgl_crew/Mitgliederladen:main into main
pull from: mgl_crew/Mitgliederladen:main
merge into: fdenzer:main
Conversation 0 Commits 46 Files changed 144 +5634 -1
fdenzer commented 2023-07-22 22:44:36 +02:00
Owner
Copy link
No description provided. 
* Anpassung des Erstellungsscripts
* Beschreibung des Zugriffs und Einlesen der Datei (momentan noch nicht funktional)
Reviewed-on: mgl_crew/Mitgliederladen#1
* Anpassung des Erstellungsscripts
* Beschreibung des Zugriffs und Einlesen der Datei (momentan noch nicht funktional)
bezeichung was written without n before ung
insert or ignore into consistently, but was `insert`, or `insert or into` in previous drafts
# Conflicts:
#	.gitignore
#	db_scripts/create.sql
This pull request has changes conflicting with the target branch.
  • .gitignore
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 main:mgl_crew-main
git switch mgl_crew-main

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 mgl_crew-main
git switch mgl_crew-main
git rebase main
git switch main
git merge --ff-only mgl_crew-main
git switch mgl_crew-main
git rebase main
git switch main
git merge --no-ff mgl_crew-main
git switch main
git merge --squash mgl_crew-main
git switch main
git merge --ff-only mgl_crew-main
git switch main
git merge mgl_crew-main
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
fdenzer/Mitgliederladen!1
No description provided.