| 13 Dec 2020 |
|  sdtv9507 joined the room. | 14:45:11 |
| sdtv9507 set a profile picture. | 14:53:43 |
| 15 Dec 2020 |
|  Daniel071 changed their display name from Daniel071 (Old) to Daniel071. | 05:50:55 |
| 21 Dec 2020 |
|  Rand0moide changed their profile picture. | 09:59:38 |
| Rand0moide changed their display name from rand_0moide to Stop.. | 09:59:54 |
 Nice Micro | to not have merge conflicts with cukmekerb , I have made a PR of my character-design branch into his fork | 16:00:35 |
| Nice Micro | and when he merged my PR into his fork, the merge commit appears on my branch on my repo | 16:01:04 |
| Nice Micro | is this expected behavior, that when I'm opening a PR, I will automatically receive the merge commit back even if I don't want to? | 16:01:51 |
| Nice Micro | I have enough on my hands debugging my own stuff, I don't want to deal with that merge commit | 16:02:25 |
| Nice Micro | if I force push to my fork from local, will that screw up cukmekerb 's fork, killing his merge commit? | 16:03:05 |
| Nice Micro | for your reference: | 16:03:17 |
| Nice Micro | https://github.com/nicemicro/opensuspect/commits/character-design | 16:03:18 |
| Nice Micro | https://github.com/vincens2005/opensuspect/pull/1 | 16:03:35 |
| Nice Micro | thanks for the help | 16:03:51 |
|  paadam94 joined the room. | 22:27:05 |
| paadam94 | hey, might be wrong channel | 22:27:22 |
| 22 Dec 2020 |
| Nice Micro | Soooo... Shall I or shan't I force push lol | 03:08:10 |
 monban | hey Nice Micro, if you force-push everyone will have to re-pull, it's not the end of the world and if you need to force push you gotta do it, but give me a moment to see if I can understand the issue and maybe we can fix it without having to force push | 03:09:39 |
|  Matrix Traveler (bot) joined the room. | 03:13:18 |
|  theslaughterbehindtheman joined the room. | 03:14:02 |
| monban | okay so what we want is a PR that merges main <- cukmekerb's PR <- nicemicro's PR right? I think we can do this | 03:20:37 |
| monban | or no, we just want to merge vincens2005/opensuspect onto main, right? but there is a conflict? | 03:23:06 |
| monban | Nice Micro? | 03:23:13 |
| Nice Micro | No, it is unrelated to OpenSuspect/opensuspect | 03:33:29 |
| Nice Micro | It is only my fork and vincens2005/opensuspect | 03:34:03 |
| monban | okay walk me though the desired end result please, that will help me understand how we can get there 🙂 | 03:34:04 |
| Nice Micro | The big question is, how did cukmekerb's merge commit got added to nicemicro/opensuspect character-design branch | 03:35:35 |
| Nice Micro | On my character-design branch I work on the same files cukmekerb works on so I suggested he pulls mine while working in it | 03:36:16 |
| Nice Micro | So I made a PR from nicemicro/opensuspect character-design branch to vincens2005/opensuspect main branch | 03:36:56 |
| Nice Micro | Which cukmekerb merged in with a merge commit into his main branch | 03:37:16 |
