Branches and merge requests
Artists usually work straight on main with locks. Programmers, and anyone making a change that needs a review, use branches and merge requests.
Branches
sh
lode switch -c task/new-hud # make a branch from the current one and move onto it
lode switch main # back (your local edits come along unless they'd clash)
lode branch # list
lode branch delete task/new-hud # delete (its creator or a maintainer); history staysAnyone can create branches that no protection rule covers (task/*, dev/*, ...); protected names need a maintainer.
Merging
lode merge <branch> brings another branch's changes into your workspace as local edits:
- files only the other branch changed are taken;
- text files marked
merge=3wayin.lodeattributesthat both sides changed are merged line by line, with conflict markers where the same lines changed; - anything else both sides changed is a conflict: your version stays until you choose.
sh
lode resolve --take theirs Content/UI/WBP_Hud.uasset # or ours, or mine (your edited file)
lode submit -m "Merge task/new-hud"
lode merge --abort # or give up and undo itEvery changeset records its parent, and merges record both, so merging again later only brings what's new.
Merge requests
sh
lode mr create --target main -t "New HUD"From a branch, this opens a merge request for that branch. With local changes and no branch (the usual artist case), it shelves them and uses the shelf; you keep your files and locks while it's reviewed.
sh
lode mr list
lode mr show 12
lode mr review 12 approve -m "Looks good" # or request-changes, or comment
lode mr merge 12
lode mr update 12 --reshelve # new revision from your current local changesReviews happen in the web app too, with diffs and line comments. --auto on create merges as soon as the approvals are in. Required checks (pipelines that must pass) and the merge queue are set on the branch's protection rule: see path owners and protection and pipelines.