WIP: Feature/import #41

Draft
root wants to merge 0 commits from feature/import into develop
root commented 2017-05-06 15:50:51 +00:00 (Migrated from dev.cryptec.at)

Fixes #22

Fixes #22
This pull request is marked as a work in progress.
View command line instructions

Checkout

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

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 'develop'
git merge --no-ff 'feature/import'
git switch 'feature/import'
git rebase 'develop'
git switch 'develop'
git merge --ff-only 'feature/import'
git switch 'feature/import'
git rebase 'develop'
git switch 'develop'
git merge --no-ff 'feature/import'
git switch 'develop'
git merge --squash 'feature/import'
git switch 'develop'
git merge --ff-only 'feature/import'
git switch 'develop'
git merge 'feature/import'
git push origin 'develop'
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
root/graphy!41
No description provided.