petermolnar/wp-ffpc
1
0
Fork 0
Code Issues 22 Pull requests 4 Projects Releases Packages Wiki Activity Actions

fixing href of settings link #38

Open
haroldkyle wants to merge 2 commits from haroldkyle/master into master
pull from: haroldkyle/master
merge into: petermolnar:master
Conversation 0 Commits 2 Files changed 1 +2 -2
haroldkyle commented 2015-03-18 15:32:54 +00:00 (Migrated from github.com)
Copy link

You had already wrapped the link in the $settings_link variable.

You had already wrapped the link in the $settings_link variable.
This pull request has changes conflicting with the target branch.
  • wp-ffpc-class.php
View command line instructions

Checkout

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

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 haroldkyle/master
git checkout haroldkyle/master
git rebase master
git checkout master
git merge --ff-only haroldkyle/master
git checkout haroldkyle/master
git rebase master
git checkout master
git merge --no-ff haroldkyle/master
git checkout master
git merge --squash haroldkyle/master
git checkout master
git merge --ff-only haroldkyle/master
git checkout master
git merge haroldkyle/master
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
duplicate

   
enhancement

   
invalid

   
question

   
wontfix
No labels
bug
duplicate
enhancement
invalid
question
wontfix
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: petermolnar/wp-ffpc#38
No description provided.
Delete branch "haroldkyle/master"

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?