obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some renames in the conflict view

Browse source
This commit is contained in:
Silvano Cerza 2025-03-01 18:24:06 +01:00
parent b263e24941
commit f72ce44504
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/views/conflicts-resolution/component.tsx → src/views/conflicts-resolution/split-diff-view.tsx
View file

@ -31,7 +31,7 @@ interface DiffViewProps {
onConflictResolved: () => void;
}
const DiffView: React.FC<DiffViewProps> = ({
const SplitDiffView: React.FC<DiffViewProps> = ({
oldText,
newText,
onOldTextChange,
@ -176,4 +176,4 @@ const DiffView: React.FC<DiffViewProps> = ({
);
};
export default DiffView;
export default SplitDiffView;

4
src/views/conflicts-resolution/view.tsx
View file

@ -1,6 +1,6 @@
import { IconName, ItemView, Menu, WorkspaceLeaf } from "obsidian";
import { Root, createRoot } from "react-dom/client";
import DiffView from "./component";
import SplitDiffView from "./split-diff-view";
import GitHubSyncPlugin from "src/main";
import * as React from "react";
import FilesTabBar from "./files-tab-bar";
@ -133,7 +133,7 @@ export class ConflictsResolutionView extends ItemView {
currentFile={currentFile?.filePath || ""}
setCurrentFileIndex={setCurrentFileIndex}
/>
<DiffView
<SplitDiffView
oldText={currentFile?.remoteContent || ""}
newText={currentFile?.localContent || ""}
onOldTextChange={(content: string) => {