| 6 Dec 2020 |
 Nice Micro | and now after the rebase (in the vim diff) you can see that it would probably get duplicated | 01:18:14 |
| Nice Micro | had I pulled and pushed again :D | 01:18:19 |
 gobbel | Did you ever do a push --force? | 01:19:27 |
| Nice Micro | nope | 01:20:22 |
| gobbel | Then the duplicate commits must have happened when you had to pull again.
For some reason your local git thought it was behind even though it wasn't. | 01:21:38 |
| Nice Micro | yeah, I guess because of the mismach between the hashes | 01:21:58 |
| Nice Micro | but why are they getting different evey time | 01:22:11 |
| Nice Micro | I figured out a way but will have to start over and make a new branch | 01:23:16 |
| Nice Micro | so if I just fetch the original PR from slaughter | 01:23:26 |
| gobbel | Why is the Merge commit for PW #243 not in the remote? | 01:23:49 |
| gobbel | You could probably make a new branch off of main and then cherrypick using the hashes | 01:24:24 |
| Nice Micro | In reply to @gobbel:matrix.org
Why is the Merge commit for PW #243 not in the remote? that has just been merged to main today | 01:24:57 |
| Nice Micro | so that's what I rebased my branch on top of today, and what I wanted to push to the remote | 01:25:24 |
| gobbel | * Why is the Merge commit for PR #243 not in the remote? | 01:25:57 |
| Nice Micro | now I have to figure out how to make a patch file based on a commit and how to apply it :D | 01:27:24 |
| gobbel | With git cherry-pick you should be able to apply individual commits somewhere else. | 01:28:25 |
| Nice Micro | all right let me try that | 01:31:50 |
| Nice Micro | so if I do that I should cancel my pull request as it will be based on an other branch now, right? | 01:43:45 |
| gobbel | Yes, I would suggest making a clean new branch and burning the other one in hell once you're done. | 01:45:17 |
| Nice Micro | :D okay | 01:51:33 |
| Nice Micro changed their display name from nicemicro to Nice Micro. | 15:34:22 |
| 12 Dec 2020 |
| Nice Micro | Is there a reason why is interact.tres gets changed after I run the project? | 13:41:19 |
| Nice Micro | --- a/src/addons/opensusinteraction/resources/interact/interact.tres
+++ b/src/addons/opensusinteraction/resources/interact/interact.tres
@@ -15,7 +15,7 @@ interact_data = {
}
-[sub_resource type="Resource" id=4]
+[sub_resource type="Resource" id=2]
resource_local_to_scene = true
resource_name = "InteractUI"
script = ExtResource( 4 )
@@ -31,7 +31,7 @@ resource_local_to_scene = true
resource_name = "InteractTask"
script = ExtResource( 5 )
task_text = ""
-ui_resource = SubResource( 4 )
+ui_resource = SubResource( 2 )
outputs/toggle_map_interactions = false
[resource]
| 13:42:52 |
| Nice Micro | the SubResource gets changed to 2 from 4 | 13:43:09 |
| 13 Dec 2020 |
|  @kimapr:matrix.org joined the room. | 12:12:53 |
| @kimapr:matrix.org | godot crashes when trying to load opensuspect in the editor | 12:13:16 |
| @kimapr:matrix.org | all assets error out when loading | 12:13:56 |
 Zapzoop0099 | you have to run git lfs before cloning | 12:25:38 |
| @kimapr:matrix.org | ah | 12:32:34 |
| Nice Micro | In reply to @kimapr:matrix.org
all assets error out when loading https://github.com/opensuspect/opensuspect/wiki/Contributors | 12:32:50 |
