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
Currently we build the react application and compile the scss on the developer machine before committing. This leads to merge conflicts in case more than one developer has worked on the React components or the scss.
Additionally given our current branching concept we will then have to resolve the same merge conflict multiple times (merging feature on dev, then merging the same feature on test, then on main).
Maybe we can find a solution that integrates the build process in the pipeline?
The text was updated successfully, but these errors were encountered:
Currently we build the react application and compile the scss on the developer machine before committing. This leads to merge conflicts in case more than one developer has worked on the React components or the scss.
Additionally given our current branching concept we will then have to resolve the same merge conflict multiple times (merging feature on dev, then merging the same feature on test, then on main).
Maybe we can find a solution that integrates the build process in the pipeline?
The text was updated successfully, but these errors were encountered: