fillotassi/HOD2018_website
1
0
Fork 2
Code Issues Pull requests 2 Releases Wiki Activity

fix #6

Open
fillotassi wants to merge 2 commits from fix-anew into master
pull from: fix-anew
merge into: fillotassi:master
Conversation 0 Commits 2 Files changed 2 +2 -1
fillotassi commented 2018-11-04 14:01:05 +01:00
Owner
Copy link
No description provided.
This pull request cannot be merged automatically due to conflicts.
Merge manually to resolve the conflicts.
View command line instructions

Checkout

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

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 checkout master
git merge --no-ff fix-anew
git checkout fix-anew
git rebase master
git checkout master
git merge --ff-only fix-anew
git checkout fix-anew
git rebase master
git checkout master
git merge --no-ff fix-anew
git checkout master
git merge --squash fix-anew
git checkout master
git merge --ff-only fix-anew
git checkout master
git merge fix-anew
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
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: fillotassi/HOD2018_website#6
No description provided.
Delete branch "fix-anew"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?