Quote from: raimondb on January 14, 2025, 11:39:15 AMIs that a safe approach, or can it also be that will git thinks the merge is not conflicting, coarchi does actually need to resolve some more logical conflicts?
Quote from: raimondb on January 14, 2025, 11:39:15 AMCheck if a branch can be fast forwarded, if so use git and not coarchi
Quote from: raimondb on January 14, 2025, 11:39:15 AMsince the change detection takes quite a lot of time.
Quote from: raimondb on January 14, 2025, 11:39:15 AMIf above successful, merge master to all branches again