mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-09-11 12:25:42 +03:00
Merge conflict resolution
This commit is contained in:
commit
d394ba01e6
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user