raboof/volare
6
22
Fork
You've already forked volare
2

Fix syntax in config examples #84

Open
raboof wants to merge 159 commits from fix-config-examples into main
pull from: fix-config-examples
merge into: raboof:main
raboof:main
raboof:prepare-for-1.11
raboof:volare-1.10
raboof:multi-system
raboof:prepare-for-0.10
raboof:volare-1.9
raboof:prepare-for-1.9
raboof:rebase-on-1.9
raboof:volare-1.8.0.x
raboof:fix-ci
raboof:test
raboof:config
raboof:flake-enable-debugging
raboof:avoid_unsplit_crash
raboof:move
raboof:move-tab-config-syntax
raboof:move-tab
raboof:implement-unsplit
raboof:build-on-ci
raboof:versioning
raboof:sway-replacement-non-goal
raboof:document-branching-strategy
raboof:drop-issue-templates
raboof:look
raboof:wallpaper
raboof:renames
raboof:remove-toggle-split
raboof:update-to-1.8
raboof:update-to-1.8-branch-off-point
raboof:unsplit
raboof:second_test
No description provided.
This pull request has changes conflicting with the target branch.
  • .builds/alpine.yml
  • .builds/archlinux.yml
  • .builds/freebsd.yml
  • CONTRIBUTING.md
  • README.md
  • completions/meson.build
  • config.in
  • flake.lock
  • flake.nix
  • include/sway/server.h
  • include/sway/tree/container.h
  • meson.build
  • meson_volare_rename.py
  • sway/commands/move.c
  • sway/commands/output.c
  • sway/commands/output/background.c
  • sway/commands/split.c
  • sway/config/bar.c
  • sway/config/output.c
  • sway/desktop/output.c
  • sway/desktop/render.c
  • sway/input/seatop_default.c
  • sway/input/seatop_move_tiling.c
  • sway/main.c
  • sway/meson.build
  • sway/test/framework.c
  • sway/tree/container.c
  • sway/xdg_activation_v1.c
  • volare.desktop
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 origin fix-config-examples:fix-config-examples
git switch fix-config-examples

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 main
git merge --no-ff fix-config-examples
git switch fix-config-examples
git rebase main
git switch main
git merge --ff-only fix-config-examples
git switch fix-config-examples
git rebase main
git switch main
git merge --no-ff fix-config-examples
git switch main
git merge --squash fix-config-examples
git switch main
git merge --ff-only fix-config-examples
git switch main
git merge fix-config-examples
git push origin main
Sign in to join this conversation.
No reviewers
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
raboof/volare!84
Reference in a new issue
raboof/volare
No description provided.
Delete branch "fix-config-examples"

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?