if (!attributes.canBeContentMerged() && worktreeDirty) { return false; if (gitlinkConflict || !attributes.canBeContentMerged()) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, 0, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, 0, 0);
if (!attributes.canBeContentMerged() && worktreeDirty) { return false; if (gitlinkConflict || !attributes.canBeContentMerged()) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, 0, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, 0, 0);