Skip to content

Conversation

@sofietoft
Copy link
Contributor

Description

  • We have removed all mentions of environment names such as "Staging/Stage" and "Development/Dev".
  • We have used "left-most environment" or "left-most mainline environment" to replace some environment names.
  • We have added a new guide on resolving merge conflicts between a flexible and a mainline environment.

Type of suggestion

  • New content
  • Updates related to a new feature

Deadline (if relevant)

April 11th.

sofietoft and others added 30 commits April 3, 2025 09:35
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Update the Flexible Environments article
Update environment references where needed in the FAQ article
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Project Overview article updated with correct environment refs
Update environment refs in Deployment article
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
sofietoft and others added 23 commits April 8, 2025 10:03
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: sofietoft <stk@umbraco.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
New article: Merge Conflicts on Flexible Environments
@sofietoft sofietoft marked this pull request as ready for review April 10, 2025 09:33
Added a new section - Syncing Changes Between Mainline and Flexible...
@sofietoft sofietoft merged commit b698a9c into main Apr 11, 2025
20 of 23 checks passed
@sofietoft sofietoft deleted the cloud/flexibleEnvironment branch April 28, 2025 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants