gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-09-11 12:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict resolution

Browse Source
This commit is contained in:
Ian Donahue 2023-03-14 18:12:53 +01:00
commit d394ba01e6
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/projects/[projectId]/+page.svelte
View File

@ -10,6 +10,7 @@
import { toHumanBranchName } from '$lib/branch';
import { list as listDeltas } from '$lib/deltas';
import { slide } from 'svelte/transition';
import { navigating } from '$app/stores';
const getBranch = (params: { projectId: string }) => invoke<string>('git_branch', params);
@ -31,6 +32,12 @@
let initiatedCommit = false;
let filesSelectedForCommit: string[] = [];
$: if ($navigating) {
commitMessage = '';
filesSelectedForCommit = [];
initiatedCommit = false;
}
function doCommit() {
if ($project) {
commit({
@ -339,8 +346,15 @@
</div>
{:else}
<button
class="button rounded bg-blue-600 py-2 px-3 text-white hover:bg-blue-700"
on:click={() => (initiatedCommit = true)}>Commit changes</button
class="button rounded bg-blue-600 py-2 px-3 text-whit hover:bg-blue-700"
on:click={() => {
filesSelectedForCommit = $filesStatus.map((file) => {
return file.path;
});
initiatedCommit = true;
}}>Commit changes</button
>
{/if}
</div>