profile #12

Open
tim wants to merge 4 commits from tim/autonomous.contact:profile into dev
Contributor
No description provided.
This pull request has changes conflicting with the target branch.
  • public/app/js/bbs-profile.js
  • public/index.html
  • public/sidebar/sidebar.html
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 profile:tim-profile
git switch tim-profile

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 dev
git merge --no-ff tim-profile
git switch tim-profile
git rebase dev
git switch dev
git merge --ff-only tim-profile
git switch tim-profile
git rebase dev
git switch dev
git merge --no-ff tim-profile
git switch dev
git merge --squash tim-profile
git switch dev
git merge --ff-only tim-profile
git switch dev
git merge tim-profile
git push origin dev
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
andyburke/autonomous.contact!12
No description provided.