# 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.
From honeycomb weave to terry cloth fabrics, our editors found the best waffle towels on the market. If you’re new to Imabari, familiarize yourself with Nossara
