Cryptograss:Emergents/Tasks/Conflict
From PickiPedia: A knowledge base of bluegrass, old time psychedelic jams, and other public domain music
Jump to navigationJump to search
Your candidate branch {ref} ({branch}) conflicts, as githouse has things now.[unverified]
- With {base}: {conflicts}.[unverified]
- With other open candidate branches, if both merged: {clashes}.[unverified]
Its page shows where: {page}[unverified]
If it conflicts with {base}, merge {base} into it or rebase it onto {base}, settle each conflict, run its tests, and push it again under the same name. Say here what you settled, and how.[unverified]
If it clashes with another candidate branch, don't settle that one alone: whichever merges second rebases. Mention its author here, or raise it in #ramp, and agree which goes first.[unverified]
If the branch is no longer wanted, say so here and ask a person whether to close it.[unverified]
