Aligned Elements Web Client User Manual
3.1.272.24402
3.1.272.24402
  • Introduction
  • Basic Concepts
  • Get Started
    • Activate your Aligned Elements Account
    • Log In
    • Open a Project
    • Change Project
    • Create a new Project
    • The Project Start Site
    • Your Assigned Items
    • Manage Your User
    • Log Out
    • Enter Design Control Items
      • Work with Chapters
      • Work with Table Attributes
      • Inserting Images in Attributes
      • Working with Traces
      • Add Issues
      • Add Attachments
      • Collaborate using Comments
      • Favourites
      • Find in... Actions
      • Inconsistencies and Positive Cues
  • Document Object Actions
    • Move and Rearrange Chapters and Document Objects
    • Update Multiple Items
    • Generate Design Control Items
    • Copy Design Control Items
    • Lock Document Objects
    • Generate Reports
    • Export Document Objects
    • Import Document Objects
    • Copy Document Objects between Projects
    • Import Files
  • Explorers and Views
    • Project Explorer
    • File Explorer
    • Trace Explorer
    • Test Run Explorer
    • Project History
    • Chapter View
    • List View
    • Search Result View
    • Export to Excel in Grids
  • Project Status
    • Display Inconsistencies
    • Display Consistency Coverage
    • Display Risk Summary
    • Display DHF Index
  • Queries
    • Run a Query
    • Design a Query
    • Query Filters
  • Charts
    • Display a Chart
    • Design a Chart
  • Trace Tables
    • Run a Trace Table
    • Design a Trace Table
  • Work with Documents
    • Adding Word Document to File Objects
    • The Word Add-in. Adding Design Control Items to Documents
    • Sign Documents with Electronic Signatures
    • Save Files to Disk
    • Released Document View
  • Design Reviews
    • Conduct a Design Review
  • Risk Analysis
    • Perform a FMEA Risk Assessment
    • Perform a Preliminary Hazard Analysis
    • Relative vs. Absolute Mitigations
    • Potential Hazard
    • Using the Risk Analysis to assess the Software Safety Classification
  • Manage Tests
    • Test Runs
      • Planning a Test Run
        • The Burndown Chart
      • Executing a Test Run
      • Completing a Test Run
      • Test Run Functions
      • Test Runs and Linked Projects
      • Caching of Test Runs and Test Run Explorer
    • Classic Tests
  • Work with Tags
    • Add Tags
    • Filter views on Tags
    • Edit Tags
    • Tags and Snapshots
  • Assistants
    • Run an Assistant
  • Snapshots
    • Create a Snapshot
    • Display a Snapshot
    • Compare Snapshots
  • Settings
    • Project Information
    • Manage Users
    • Manage User Groups
    • Project Settings
    • Project Hierarchy
      • Branch Projects
      • Merge Projects
    • Unlock Objects
  • Dashboards
    • Select a Dashboard
    • Create a Dashboard
    • Remove a Dashboard
  • AI Features
    • AI Features in Aligned Elements
  • Aligned Elements Automation Tool
    • The Automation Tool
  • Web Administrator Tools
    • Manage Projects
    • Rename, Copy or Remove Project
    • Manage Users
    • Manage Permissions
    • Register a new Administrator
    • Inspect User Logs
    • Manage Templates
    • Download Log Files
  • Manage Service Configuration
  • Configure a Type Name Change
Powered by GitBook
On this page
  1. Settings
  2. Project Hierarchy

Merge Projects

Merging

When merging a branch back to the origin project, Document Object changes in the branch are added to the origin. If any conflicts exist between changes in the origin and the branch, they will be displayed to you and you can decide which version to use; i.e., the origin change or the branch change.

Note that the following elements are not merged back to the origin:

  • Test Runs

  • Signatures

  • Trace Tables

  • Queries

  • Charts

  • Tags

  • Locked Document Objects

  • Snapshots

  • Reviews

  • Users and User Groups

Template Paths – The Template path for the original and the branch project must be exactly the same at the time of merge.

Users – The users in both the original and branch project must be the same at the time of merge.

Note that the branch project still exists after merging. Although it is possible to continue working on the branch and merge additional changes back to the origin, only changes after the last merge occasion will be considered during a subsequent merge.

Note! At merge, the locking status of Document Objects in the target project are ignored i.e. when applicable locked objects are going to be overwritten by data from branched project during th emerge project. Therefore, it is best practice to make sure that no-one is working in to the target project when the merge action takes place.

PreviousBranch ProjectsNextUnlock Objects