Skip to content
This repository was archived by the owner on Feb 11, 2026. It is now read-only.

Upstream merge process#56

Merged
hazzuk merged 3 commits intomasterfrom
element-merge-process
May 13, 2025
Merged

Upstream merge process#56
hazzuk merged 3 commits intomasterfrom
element-merge-process

Conversation

@hazzuk
Copy link
Copy Markdown
Member

@hazzuk hazzuk commented May 13, 2025

Improves the documentation on the process of merging the Element-web upstream with elecord.

Also adds a previously local script I've been using to more easily manage removed files during a merge.

hazzuk added 3 commits May 13, 2025 13:05
To help control end-of-line normalization for shell scripts.
Used during upstream merges to remove previously removed upstream files that have since been edited.
@hazzuk hazzuk added the documentation Improvements or additions to documentation label May 13, 2025
@github-actions
Copy link
Copy Markdown

Cloudflare Pages deployment

Latest commit ad25e52b38dffca48c289f50875ada5207d6abbb
Status ✅ Deployed!
URL https://9faaaea3.elecord-web.pages.dev

@hazzuk hazzuk merged commit a9e5721 into master May 13, 2025
2 checks passed
@hazzuk hazzuk deleted the element-merge-process branch May 13, 2025 12:19
hazzuk added a commit that referenced this pull request May 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant