| *** kirillka <kirillka!~Miranda@195.242.142.17> has joined #mantisbt | 00:43 | |
| *** Kunda <Kunda!~sphenoid@cpe-68-201-94-52.stx.res.rr.com> has quit IRC | 01:38 | |
| *** giallu_ <giallu_!~giallu@adsl-ull-106-61.40-151.net24.it> has joined #mantisbt | 03:06 | |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has joined #mantisbt | 03:06 | |
| GitHub | [mantisbt] dregad pushed 1 new commit to master: http://git.io/09voNA | 05:46 |
|---|---|---|
| GitHub | mantisbt/master d79e6ba Damien Regad: Revert inadvertant update of ADOdb submodule... | 05:46 |
| travis-ci | [travis-ci] Build #891: mantisbt/mantisbt master (d79e6ba) Damien Regad - The build passed. | 05:49 |
| travis-ci | [travis-ci] Build details: http://travis-ci.org/mantisbt/mantisbt/builds/29872717 | 05:49 |
| travis-ci | [travis-ci] Code Changes: https://github.com/mantisbt/mantisbt/compare/07c6605bc49c...d79e6ba1ccc8 | 05:49 |
| *** gingerling <gingerling!~gingerlin@host-92-23-11-86.as13285.net> has joined #mantisbt | 06:15 | |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has quit IRC | 07:31 | |
| GitHub | [mantisbt] atrol pushed 1 new commit to master: http://git.io/RPBNwA | 07:54 |
| GitHub | mantisbt/master fd4c97b Roland Becker: Added missing semicolon | 07:54 |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has joined #mantisbt | 09:57 | |
| *** kirillka <kirillka!~Miranda@195.242.142.17> has quit IRC | 10:01 | |
| *** Protogenes <Protogenes!~Protogene@dslb-188-106-220-078.pools.arcor-ip.net> has joined #mantisbt | 10:22 | |
| *** Protogenes <Protogenes!~Protogene@dslb-188-106-220-078.pools.arcor-ip.net> has joined #mantisbt | 10:35 | |
| * paulr pokes dregad | 14:18 | |
| paulr | wtf | 14:21 |
| * paulr pokes jreese | 14:23 | |
| * jreese pokes back | 14:23 | |
| paulr | help ;/ | 14:24 |
| jreese | with what? | 14:24 |
| paulr | git ;p | 14:24 |
| paulr | it's lying to me ;P | 14:24 |
| paulr | ! [rejected] long_arrays -> long_arrays (non-fast-forward) | 14:24 |
| paulr | error: failed to push some refs to 'git@github.com:grangeway/mantisbt.git' | 14:24 |
| paulr | hint: Updates were rejected because a pushed branch tip is behind its remote | 14:24 |
| paulr | hint: counterpart. Check out this branch and integrate the remote changes | 14:24 |
| paulr | hint: (e.g. 'git pull ...') before pushing again. | 14:24 |
| jreese | git doesn't lie; you're obviously just asking it the wrong questions :P | 14:24 |
| jreese | `git pull --rebase` | 14:25 |
| paulr | git log shows: | 14:25 |
| paulr | commit bd31c0e1aae2b604ebad06c01c2f6c99ae0f873b - i.e. my new commit | 14:25 |
| paulr | commit fd4c97b07bd3efc212f4e8b4138285468692fbcb | 14:26 |
| paulr | followed by that that's current master | 14:26 |
| paulr | $ git pull --rebase | 14:26 |
| paulr | There is no tracking information for the current branch. | 14:26 |
| paulr | Please specify which branch you want to rebase against. | 14:26 |
| jreese | are you sure you're trying to push to/from the correct branch? | 14:26 |
| paulr | git's graph looks ok ;p | 14:27 |
| paulr | http://postimg.org/image/jhbvv205z/ | 14:28 |
| paulr | so that looks fine to me i think jreese? | 14:29 |
| jreese | ok, but your local long_arrays branch is probably divergent from the remote long_arrays branch, and that's why it's complaining | 14:31 |
| paulr | my local branch was the same last night | 14:31 |
| paulr | when i pushed it | 14:31 |
| paulr | and i've only tried rebasing it for roland's commit today | 14:31 |
| paulr | and re-pushing | 14:31 |
| jreese | if you rebase your local branch, then that's why pushing is failing, you've made it divergent | 14:32 |
| jreese | you either need to force-push to long_arrays to overwrite what's there, or you have to merge between long_arrays and master | 14:32 |
| paulr | so i just need to force push it | 14:32 |
| paulr | why does my local git still see a remote i've deleted? | 14:34 |
| paulr | now I need to find local branch I've lost | 14:39 |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has quit IRC | 14:48 | |
| *** gingerling <gingerling!~gingerlin@host-92-23-11-86.as13285.net> has quit IRC | 15:04 | |
| GitHub | [mantisbt] grangeway pushed 1 new commit to master: http://git.io/Csxkkw | 15:13 |
| GitHub | mantisbt/master 13c2096 Paul Richards: Fix: Email processing occurs in the wrong order.... | 15:13 |
| GitHub | [mantisbt] grangeway pushed 1 new commit to master: http://git.io/NUvfzg | 15:18 |
| GitHub | mantisbt/master d508493 Paul Richards: Fix #0016570: Page content is forgotten when user clicks [Back] button... | 15:18 |
| *** Protogenes <Protogenes!~Protogene@dslb-188-106-220-078.pools.arcor-ip.net> has quit IRC | 15:40 | |
| *** Protogenes <Protogenes!~Protogene@dslb-188-106-220-078.pools.arcor-ip.net> has joined #mantisbt | 15:40 | |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has joined #mantisbt | 15:46 | |
| *** Protogenes <Protogenes!~Protogene@dslb-188-106-220-078.pools.arcor-ip.net> has quit IRC | 15:47 | |
| paulr | jreese: : still lurking? | 16:40 |
| *** giallu_ <giallu_!~giallu@fedora/giallu> has quit IRC | 16:45 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has quit IRC | 17:10 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has joined #mantisbt | 17:13 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has quit IRC | 17:34 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has joined #mantisbt | 17:34 | |
| GitHub | [mantisbt] grangeway pushed 1 new commit to master: http://git.io/RjFpNw | 19:08 |
| GitHub | mantisbt/master 81c9a27 Paul Richards: Fix missed global variables | 19:08 |
| paulr | well, that was a productive evening | 19:15 |
| *** micahg <micahg!~micahg@ubuntu/member/micahg> has quit IRC | 23:12 | |
| *** siebrand <siebrand!~siebrand@5357156B.cm-6-8a.dynamic.ziggo.nl> has quit IRC | 23:12 | |
| *** paulr <paulr!paul@atlantis.shroudbox.net> has quit IRC | 23:12 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has quit IRC | 23:12 | |
| *** Ragnor <Ragnor!~Ragnor@dslb-092-072-242-030.pools.arcor-ip.net> has quit IRC | 23:12 | |
| *** roentgen <roentgen!~none@openvpn/community/support/roentgen> has joined #mantisbt | 23:20 | |
| *** paulr <paulr!paul@atlantis.shroudbox.net> has joined #mantisbt | 23:20 | |
| *** siebrand <siebrand!~siebrand@5357156B.cm-6-8a.dynamic.ziggo.nl> has joined #mantisbt | 23:20 | |
| *** Ragnor <Ragnor!~Ragnor@dslb-092-072-242-030.pools.arcor-ip.net> has joined #mantisbt | 23:20 | |
| *** micahg <micahg!~micahg@ubuntu/member/micahg> has joined #mantisbt | 23:20 | |
Generated by irclog2html.py 2.13.0 by Marius Gedminas - find it at mg.pov.lt!