| *** tpb has joined #timvideos | 00:00 | |
| mithro | Ishan_Bansal: can't see file on your local computer but it sounds like progress | 00:14 |
|---|---|---|
| *** sb0 has quit IRC | 01:58 | |
| *** sb0 has joined #timvideos | 02:58 | |
| *** rohitksingh_work has joined #timvideos | 03:35 | |
| mithro | Ishan_Bansal: Ping? I merged your current pull request, can you send the next one? | 04:23 |
| mithro | paddatrapper: ping? | 07:26 |
| paddatrapper | mithro: pong | 07:26 |
| mithro | paddatrapper: Had any luck? | 07:27 |
| paddatrapper | mithro: haven't had a chance to try further. Been trying to catch up assignments. Hope to be able to try again this weekend | 07:28 |
| mithro | paddatrapper: Okay, I should be around on the weekend too | 07:31 |
| paddatrapper | mithro: ok cool | 07:31 |
| *** [d__d] has quit IRC | 08:19 | |
| *** [d__d] has joined #timvideos | 08:22 | |
| *** thaytan_ has joined #timvideos | 08:55 | |
| *** thaytan has quit IRC | 08:59 | |
| *** sb0 has quit IRC | 09:05 | |
| John_K | Mithro: if you re-pull CypressFX into your checkout it should start working | 09:22 |
| John_K | I reduced the required change set to a one line fix | 09:22 |
| Ishan_Bansal | mithro : ping | 09:24 |
| *** tangrs has quit IRC | 10:02 | |
| *** tangrs has joined #timvideos | 10:14 | |
| Ishan_Bansal | mithro : Sorry for the previous one. The documentation is in the following link: | 10:21 |
| Ishan_Bansal | https://github.com/ishan98/litejpeg/tree/Adding_Documentation/Documentation | 10:21 |
| tpb | Title: litejpeg/Documentation at Adding_Documentation · ishan98/litejpeg · GitHub (at github.com) | 10:21 |
| *** rohitksingh_work has quit IRC | 10:40 | |
| *** rohitksingh_work has joined #timvideos | 10:41 | |
| mithro | Ishan_Bansal: pong | 10:43 |
| mithro | Ishan_Bansal: Did you see I merged your pull request? You can send the next one now... | 10:44 |
| *** rohitksingh_wor1 has joined #timvideos | 10:45 | |
| Ishan_Bansal | mithro : ya, Actually I have added some additional commits in the rle core branch and those are not in the huffman. So isn't it create problem while merging the two ? | 10:45 |
| mithro | Ishan_Bansal: You might have to manually merge the new rle-core branch into the huffman before sending the pull request | 10:46 |
| *** rohitksingh_work has quit IRC | 10:46 | |
| mithro | Ishan_Bansal: You can also enable "readthedocs" for your GitHub repo so that you can have them automatically published | 10:49 |
| mithro | Ishan_Bansal: https://readthedocs.org/ | 10:49 |
| *** sb0 has joined #timvideos | 11:23 | |
| Ishan_Bansal | mithro : ping | 11:27 |
| mithro | Ishan_Bansal: pong | 11:32 |
| Ishan_Bansal | mithro : How can I check that what things are creating problems while merging the two branches | 12:24 |
| Ishan_Bansal | mithro : Also I have added all the files which are changed in the RLE into the huffman but still it is showing not able to merge automatically. | 12:30 |
| Ishan_Bansal | mithro : With this thing should I generate a pull request or I have to do something first to get it automatic merge. | 12:30 |
| mithro | Ishan_Bansal: do a "git remote add upstream https://github.com/timvideos/litejpeg.git; git fetch" then a "git merge upstream/master" | 12:45 |
| Ishan_Bansal | mithro : following thing is coming : | 12:50 |
| Ishan_Bansal | merge: upstream/master - not something we can merge | 12:50 |
| mithro | oh sorry | 12:51 |
| mithro | git fetch upstream | 12:51 |
| Ishan_Bansal | mithro : Here is the file where the conflict is taking place but I am not able to catch what is the problem | 12:54 |
| Ishan_Bansal | merge: upstream/master - not something we can merge | 12:54 |
| Ishan_Bansal | mithro :sorry wrong one | 12:55 |
| Ishan_Bansal | https://github.com/timvideos/litejpeg/pull/3/conflicts | 12:55 |
| mithro | https://wincent.com/wiki/Understanding_Git_conflict_markers | 12:56 |
| tpb | Title: Understanding Git conflict markers · wincent.com (at wincent.com) | 12:56 |
| mithro | https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/merge-conflicts | 12:57 |
| tpb | Title: Dealing With Merge Conflicts (at www.git-tower.com) | 12:57 |
| mithro | https://githowto.com/resolving_conflicts | 12:58 |
| tpb | Title: 30. Resolving Conflicts (at githowto.com) | 12:58 |
| mithro | Ishan_Bansal: do they help? | 12:59 |
| *** rohitksingh_wor1 has quit IRC | 12:59 | |
| Ishan_Bansal | mithro : I think they will, I am going through them. | 13:00 |
| mithro | okay cool | 13:00 |
| *** ChanServ sets mode: +v thaytan_ | 13:22 | |
| *** thaytan_ is now known as thaytan | 13:22 | |
| Ishan_Bansal | mithro : Done. Now you can review the pull request. :) | 13:25 |
| *** nueces has joined #timvideos | 18:16 | |
| *** thaytan_ has joined #timvideos | 19:31 | |
| *** thaytan has quit IRC | 19:35 | |
| cr1901_modern | mithro: flterm xmodem support is nearly complete, but the transfer locks up at the last packet and blocks in write() syscall when I try sending the last packet (what the hell?!) | 22:38 |
| cr1901_modern | mithro: Wait... that's not possible. serialfd was opened as O_NONBLOCK. | 22:40 |
| cr1901_modern | Errr, nevermind... logic error | 22:42 |
| * cr1901_modern really needs to work on not assuming the impossible as happened... | 22:42 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!