add deepCompare for merge, WIP merge
This commit is contained in:
parent
ed7810cded
commit
cf5b11b267
6 changed files with 234 additions and 19 deletions
|
|
@ -41,11 +41,26 @@
|
|||
</div>
|
||||
|
||||
<!-- File Change Status -->
|
||||
<button *ngIf="showDetectChanges">
|
||||
<button onclick="patch_merge_modal.showModal()" *ngIf="showDetectChanges">
|
||||
|
||||
<h1 class="text-center font-extrabold text-2xl text-red-500 animate-pulse">Detect Changes! Click</h1>
|
||||
|
||||
</button>
|
||||
<dialog id="patch_merge_modal" class="modal">
|
||||
|
||||
<div class="modal-box max-w-screen-2xl">
|
||||
<app-merge
|
||||
[commit]="changesCommit"
|
||||
></app-merge>
|
||||
<div class="modal-action sticky bottom-0 right-0">
|
||||
<form method="dialog">
|
||||
<button class="btn btn-warning">Close</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</dialog>
|
||||
|
||||
<div class="flex items-center">
|
||||
<div class="flex items-center ml-3">
|
||||
|
|
@ -168,4 +183,3 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!--Modal-->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue