FOSS/xfreerdp-gui
Watch
1
0
Fork
You've already forked xfreerdp-gui
 0
Code Issues 2 Pull requests 1 Projects Releases 6 Packages Wiki Activity Actions

WIP: Draft: Resolve "Add config deletion support" #7

Draft
kory wants to merge 2 commits from 2-add-config-deletion-support into trunk
pull from: 2-add-config-deletion-support
merge into: FOSS:trunk
Conversation 3 Commits 2 Files changed 3 +39 -1
kory commented 2024-01-01 20:03:44 +00:00 (Migrated from gitlab.arcanecomputers.com)
Copy link

Closes #2

Closes #2
kory commented 2024-01-01 20:06:38 +00:00 (Migrated from gitlab.arcanecomputers.com)
Copy link

added 1 commit

  • 43b90728 - Add elements needed to process a config deletion #2

Compare with previous version

added 1 commit <ul><li>43b90728 - Add elements needed to process a config deletion #2</li></ul> [Compare with previous version](/public-snippets/xfreerdp-gui/-/merge_requests/3/diffs?diff_id=37&start_sha=8cf9ed54b9706e8e9b8626509577683a9031ac28)
kory commented 2024-01-01 20:40:11 +00:00 (Migrated from gitlab.arcanecomputers.com)
Copy link

added 5 commits

  • 43b90728...d15f793a - 4 commits from branch trunk
  • 0a59d284 - Add elements needed to process a config deletion #2

Compare with previous version

added 5 commits <ul><li>43b90728...d15f793a - 4 commits from branch <code>trunk</code></li><li>0a59d284 - Add elements needed to process a config deletion #2</li></ul> [Compare with previous version](/public-snippets/xfreerdp-gui/-/merge_requests/3/diffs?diff_id=43&start_sha=43b90728a8e588057980b6cb84ca1143eed7787f)
kory commented 2024-01-01 20:41:21 +00:00 (Migrated from gitlab.arcanecomputers.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>dc74e920 - Fix toggle position</li></ul> [Compare with previous version](/public-snippets/xfreerdp-gui/-/merge_requests/3/diffs?diff_id=45&start_sha=0a59d28480d9480121ff0187e2547517377432f8)
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 2-add-config-deletion-support:2-add-config-deletion-support
git switch 2-add-config-deletion-support

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 trunk
git merge --no-ff 2-add-config-deletion-support
git switch 2-add-config-deletion-support
git rebase trunk
git switch trunk
git merge --ff-only 2-add-config-deletion-support
git switch 2-add-config-deletion-support
git rebase trunk
git switch trunk
git merge --no-ff 2-add-config-deletion-support
git switch trunk
git merge --squash 2-add-config-deletion-support
git switch trunk
git merge --ff-only 2-add-config-deletion-support
git switch trunk
git merge 2-add-config-deletion-support
git push origin trunk
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

   
Enhancement
No labels
Bug
Enhancement
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
FOSS/xfreerdp-gui!7
No description provided.