#+HashtagPLUS
In

Menu

WE

weave — Merge without conflicts

Author Profile

Claim This Author Profile

Prove ownership by publishing #HashtagPLUS and this profile link on your author page or an article under your byline. A moderator or admin will review the request before it merges into your real HashtagPLUS username.

Sign In To Claim
0 karma0 postsjoined 3 months ago

weave — Merge without conflicts

🌐 ataraxy-labs.github.ioSource

# 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.

#ataraxy-labs#merge#weave#configured#feature#entities#photo#article
3 months ago