# Same merge, with weave configured $ git merge feature-b weave [src/lib.ts]: 2 entities matched, 2 modified, 0 conflicts Merge made by the 'ort' strategy. # Different functions = no conflict.
Anonymous readers can preview up to 1024 characters here. Log in to unlock the full article once ingest succeeds.