| 22 Dec 2020 |
 Nice Micro | But the merge commit is now also in nicemicro/OpenSuspect character-design branch | 03:37:47 |
| Nice Micro | Which is of course not on my local branch | 03:38:24 |
| Nice Micro | But now I am working on my local branch debugging my stuff | 03:38:40 |
 monban | so now when you try to push to your character-design branch, it tells you the remote branch is ahead of your local and you need to pull first | 03:38:58 |
| Nice Micro | Yep | 03:39:07 |
| Nice Micro | Which would just give me additional issues while I am debugging my stuff | 03:39:29 |
| Nice Micro | Is this how prs should work though? | 03:39:55 |
| monban | I'm not really sure, I'm not accustomed to doing a PR on a branch, I must admit that's new to me | 03:40:21 |
| monban | I will say, assuming you don't need that merge commit (because it's just pulling in changes on his branch, which will still be there) you should be completely safe to force push | 03:40:53 |
| Nice Micro | So I am worried if I force push that might affect the pr and cukmekerb's fork | 03:41:05 |
| monban | I thought you were wanting to force push on opensuspect/opensuspect, which would mean we'd all need to pull it back down again, since it's your branch, you do you 😀 | 03:41:23 |
| monban | um so let me see where is the PR | 03:41:33 |
| Nice Micro | https://github.com/vincens2005/opensuspect/pull/1 | 03:41:51 |
| monban | so that PR is already merged, force-pushing your branch will not effect it | 03:42:19 |
| monban | if it was still open, it would just update the PR to whatever the state of your branch was | 03:42:40 |
| Nice Micro | Ohh that's good to know, thanks | 03:42:41 |
| monban | but since it's merged, you're safe to do whatever you want on your fork / branch and it won't effect it anymore | 03:43:01 |
| Nice Micro | I use the same branch to do the pr to OpenSuspect/OpenSuspect too | 03:43:28 |
| Nice Micro | Maybe that's what was not a good idea lol | 03:43:47 |
 theslaughterbehindtheman | why does git work like this | 03:43:54 |
| Nice Micro | It might be github specific issue, with the pr implementation, i guess | 03:44:45 |
| monban | 😀 I'm not sure if it could work better, merging changes from multiple different sources without any one branch being "authoritative" is a surprisingly complicated problem in computer science | 03:45:20 |
| monban | opensuspect/opensuspect#main is special only because we humans declare it to be so, from a cvs perspective each and every branch is just as "important" | 03:46:20 |
|  @mbulgakov:matrix.org joined the room. | 10:56:47 |
| @mbulgakov:matrix.org | hey, im getting this message when I try to import the project to godot: handle_crash: Program crashed with signal 11
Dumping the backtrace. Please include this when reporting the bug on https://github.com/godotengine/godot/issues
[1] /usr/lib/libc.so.6(+0x3d6a0) [0x7f3168a776a0] (??:0)
[2] /usr/bin/godot() [0x2ad6356] (??:?)
[3] /usr/bin/godot() [0x162ad68] (??:?)
[4] /usr/bin/godot() [0x127e1d1] (??:?)
[5] /usr/bin/godot() [0x1280644] (??:?)
[6] /usr/bin/godot() [0x1281dd2] (??:?)
[7] /usr/bin/godot() [0x1282e32] (??:?)
[8] /usr/bin/godot() [0x2b07064] (??:?)
[9] /usr/bin/godot() [0x1c0e78a] (??:?)
[10] /usr/bin/godot() [0x1c18bf0] (??:?)
[11] /usr/bin/godot() [0x782c9a] (??:0)
[12] /usr/bin/godot() [0x769691] (??:0)
[13] /usr/bin/godot() [0x75844d] (??:0)
[14] /usr/lib/libc.so.6(__libc_start_main+0xf2) [0x7f3168a62152] (??:0)
[15] /usr/bin/godot() [0x75ab0e] (??:0)
-- END OF BACKTRACE --
| 10:58:37 |
| @mbulgakov:matrix.org | any ideas what could it be? | 10:58:45 |
| Nice Micro | What distro are you on? | 11:53:01 |
|  damjan94 joined the room. | 12:49:20 |
| @mbulgakov:matrix.org | arch | 13:19:33 |
| @mbulgakov:matrix.org | I just found the opensuspect website so i found out i should have git lfs installed | 13:33:31 |
