You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
While answering and discussing this issue #313 the concerns got raised, that on UNIX operating systems files and directories starting with a "." are hidden by default but not on windows.
In order not to confuse users with multiple "similar" filenames, one suggestion was to store the "versioned" files in a different directory location. Which may make it harder for users to identify and localize the files required for a three-way merge.
a) project specific configuration file used by the build process
b) copy of the configuration file version used as the basis of the project specific file as provided by the component version at the time when the component was added or an updated version merged
unmodified
read-only
provides version information
c) copy of the configuration file as provided by the current component version / pack version when processed
Note:
a) we need to be able to identify which versioned file is the basis of the actual configuration file.
b) the tools shall remove any "update" configuration file that was not merged.
c) there is a maximum of one "update" file present or none in case the version of "update" would match "original".
The text was updated successfully, but these errors were encountered:
This has not been implemented in csolution (RTE-Model) yet.
During discussion @edriouk and @brondani suggested to use base instead of current as this term is also used by git merge.
While answering and discussing this issue #313 the concerns got raised, that on UNIX operating systems files and directories starting with a "." are hidden by default but not on windows.
In order not to confuse users with multiple "similar" filenames, one suggestion was to store the "versioned" files in a different directory location. Which may make it harder for users to identify and localize the files required for a three-way merge.
a) project specific configuration file used by the build process
b) copy of the configuration file version used as the basis of the project specific file as provided by the component version at the time when the component was added or an updated version merged
c) copy of the configuration file as provided by the current component version / pack version when processed
Alternative using current and update
Note:
a) we need to be able to identify which versioned file is the basis of the actual configuration file.
b) the tools shall remove any "update" configuration file that was not merged.
c) there is a maximum of one "update" file present or none in case the version of "update" would match "original".
The text was updated successfully, but these errors were encountered: