potiuk commented on PR #246:
URL: https://github.com/apache/airflow-steward/pull/246#issuecomment-4521944644

   Rebased on current `main` to clear the merge conflict.
   
   The conflict came from a parallel merge: #247 (Pattern D — single 
directory-symlink layout) landed on `main` while this PR was open, and rewrote 
the same `# OR for double-symlinked: ...` comment blocks in Methods 2 and 3 of 
`docs/setup/install-recipes.md`. Resolution: kept #247's updated "pick A / B / 
D (see Method 1 step 2)" wording and three-pattern structure, and applied this 
PR's `mkdir -p .claude/skills` line before the `cp -r` in all three methods 
(Method 1 step 2 had merged cleanly on its own).
   
   No content changes beyond conflict resolution. Force-pushed to your branch 
since maintainer edits are enabled.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to