| *** sbfox1 has joined #openstack-horizon | 00:13 | |
| *** sbfox has quit IRC | 00:13 | |
| *** david-lyle has joined #openstack-horizon | 00:19 | |
| *** hurgleburgler has quit IRC | 00:23 | |
| *** david-lyle_ has joined #openstack-horizon | 00:29 | |
| *** ZZelle_ has quit IRC | 00:30 | |
| exploreshaifali | david-lyle, hi | 00:31 |
|---|---|---|
| exploreshaifali | david-lyle, please can u tell me how to solve merge conflicts issue https://review.openstack.org/#/c/126141/ | 00:32 |
| *** david-lyle has quit IRC | 00:32 | |
| david-lyle_ | exploreshaifali, I can't really dig into it right now, but you'll have to rebase your patch to master | 00:34 |
| exploreshaifali | david-lyle_, rebase patch to master means what? | 00:35 |
| david-lyle_ | hopefully, you created a branch for your patch | 00:36 |
| exploreshaifali | yes | 00:37 |
| david-lyle_ | if you did check out the master branch; do a "git pull origin master: | 00:39 |
| david-lyle_ | ignore the : was a mistake | 00:39 |
| david-lyle_ | then checkout your feature branch | 00:39 |
| david-lyle_ | then type "git rebase -i master" | 00:40 |
| *** yjiang5 has quit IRC | 00:40 | |
| david-lyle_ | you will get conflicts | 00:40 |
| david-lyle_ | you will need to edit the files with conflicts and then do a git add for each of those files | 00:40 |
| david-lyle_ | google git rebase if you run into issues | 00:42 |
| david-lyle_ | have to run | 00:42 |
| exploreshaifali | ok | 00:42 |
| exploreshaifali | is there any option | 00:42 |
| exploreshaifali | to do avoid this | 00:42 |
| exploreshaifali | if I don't want to have/ use old patches | 00:43 |
| *** Drago has joined #openstack-horizon | 00:43 | |
| exploreshaifali | or I have to rebase it with master? | 00:43 |
| exploreshaifali | is the only option | 00:43 |
| *** david-lyle_ has quit IRC | 00:46 | |
| *** Drago has quit IRC | 00:46 | |
| *** bpokorny has quit IRC | 01:18 | |
| *** sbfox1 has quit IRC | 01:31 | |
| *** rbertram has quit IRC | 01:38 | |
| *** ybathia has quit IRC | 01:49 | |
| *** jacalcat has joined #openstack-horizon | 02:02 | |
| *** hewbrocca has quit IRC | 02:03 | |
| *** hewbrocca has joined #openstack-horizon | 02:03 | |
| *** ramishra has joined #openstack-horizon | 02:10 | |
| *** jwy has quit IRC | 02:11 | |
| *** lhcheng has quit IRC | 02:18 | |
| *** lhcheng has joined #openstack-horizon | 02:19 | |
| *** lhcheng has quit IRC | 02:24 | |
| *** johnma has quit IRC | 02:27 | |
| *** ramishra has quit IRC | 02:35 | |
| *** nikunj2512 has joined #openstack-horizon | 02:37 | |
| *** jacalcat has quit IRC | 02:44 | |
| *** tzumainn has quit IRC | 03:01 | |
| *** wuhg has joined #openstack-horizon | 03:01 | |
| *** exploreshaifali has quit IRC | 03:16 | |
| *** lhcheng has joined #openstack-horizon | 03:58 | |
| *** nikunj2512 has quit IRC | 04:59 | |
| *** Doe has joined #openstack-horizon | 05:04 | |
| *** jtomasek has joined #openstack-horizon | 05:16 | |
| *** jtomasek has quit IRC | 05:52 | |
| *** wuhg has quit IRC | 05:53 | |
| *** jtomasek has joined #openstack-horizon | 05:57 | |
| *** harlowja is now known as harlowja_away | 06:05 | |
| *** jtomasek has quit IRC | 06:06 | |
| *** exploreshaifali has joined #openstack-horizon | 06:06 | |
| *** exploreshaifali has quit IRC | 06:10 | |
| *** Longgeek has joined #openstack-horizon | 06:17 | |
| *** Longgeek_ has joined #openstack-horizon | 06:27 | |
| *** Doe has quit IRC | 06:28 | |
| *** Longgeek has quit IRC | 06:30 | |
| *** Doe has joined #openstack-horizon | 06:46 | |
| *** e0ne has joined #openstack-horizon | 06:52 | |
| *** e0ne has quit IRC | 06:54 | |
| *** e0ne has joined #openstack-horizon | 06:57 | |
| *** exploreshaifali has joined #openstack-horizon | 06:59 | |
| *** Longgeek_ has quit IRC | 06:59 | |
| *** e0ne has quit IRC | 07:02 | |
| *** denis_makogon has joined #openstack-horizon | 07:02 | |
| *** e0ne has joined #openstack-horizon | 07:06 | |
| *** Longgeek has joined #openstack-horizon | 07:06 | |
| *** e0ne has quit IRC | 07:08 | |
| *** cedrics has joined #openstack-horizon | 07:09 | |
| *** sayan_ has quit IRC | 07:18 | |
| *** echevemaster has quit IRC | 07:19 | |
| *** sayan has joined #openstack-horizon | 07:25 | |
| *** zigo has quit IRC | 07:26 | |
| *** zigo has joined #openstack-horizon | 07:27 | |
| *** cedrics has quit IRC | 07:28 | |
| *** nikunj2512 has joined #openstack-horizon | 07:30 | |
| *** nikunj2512 has quit IRC | 07:39 | |
| *** exploreshaifali has quit IRC | 07:40 | |
| *** nikunj2512 has joined #openstack-horizon | 07:41 | |
| *** nikunj2512 has quit IRC | 07:50 | |
| *** cedrics has joined #openstack-horizon | 07:50 | |
| *** nikunj2512 has joined #openstack-horizon | 07:52 | |
| *** denis_makogon has quit IRC | 07:56 | |
| *** cedrics has quit IRC | 07:59 | |
| *** sayali has joined #openstack-horizon | 08:03 | |
| *** nikunj2512 has quit IRC | 08:08 | |
| *** nikunj2512 has joined #openstack-horizon | 08:09 | |
| *** sayali has quit IRC | 08:09 | |
| *** Doe has quit IRC | 08:10 | |
| *** nlahouti has joined #openstack-horizon | 08:15 | |
| *** lhcheng has quit IRC | 08:15 | |
| *** nlahouti has quit IRC | 08:16 | |
| *** lhcheng has joined #openstack-horizon | 08:16 | |
| *** exploreshaifali has joined #openstack-horizon | 08:17 | |
| *** nikunj2512 has quit IRC | 08:17 | |
| *** lhcheng has quit IRC | 08:20 | |
| *** e0ne has joined #openstack-horizon | 08:26 | |
| *** e0ne has quit IRC | 08:28 | |
| *** nikunj2512 has joined #openstack-horizon | 08:35 | |
| *** cedrics has joined #openstack-horizon | 08:50 | |
| *** cedrics has quit IRC | 09:00 | |
| *** Longgeek has quit IRC | 09:09 | |
| *** lhcheng has joined #openstack-horizon | 09:17 | |
| *** exploreshaifali has quit IRC | 09:17 | |
| *** lhcheng has quit IRC | 09:21 | |
| *** ramishra has joined #openstack-horizon | 09:34 | |
| *** ZZelle_ has joined #openstack-horizon | 09:45 | |
| *** cedrics has joined #openstack-horizon | 09:50 | |
| *** ramishra has quit IRC | 09:52 | |
| *** Doe has joined #openstack-horizon | 09:58 | |
| *** cedrics has quit IRC | 09:59 | |
| *** alexpilotti has joined #openstack-horizon | 10:04 | |
| *** cedrics has joined #openstack-horizon | 10:07 | |
| *** Doe has quit IRC | 10:07 | |
| *** exploreshaifali has joined #openstack-horizon | 10:07 | |
| *** Longgeek has joined #openstack-horizon | 10:10 | |
| *** sayali has joined #openstack-horizon | 10:13 | |
| *** sayan has quit IRC | 10:13 | |
| *** Longgeek has quit IRC | 10:15 | |
| *** cedrics has quit IRC | 10:15 | |
| *** Longgeek has joined #openstack-horizon | 10:16 | |
| *** lhcheng has joined #openstack-horizon | 10:17 | |
| *** exploreshaifali has quit IRC | 10:20 | |
| *** exploreshaifali has joined #openstack-horizon | 10:21 | |
| *** lhcheng has quit IRC | 10:22 | |
| *** lhcheng has joined #openstack-horizon | 10:22 | |
| *** lhcheng has quit IRC | 10:27 | |
| *** sayali has quit IRC | 10:28 | |
| *** nikunj2512 has quit IRC | 10:33 | |
| *** nikunj2512 has joined #openstack-horizon | 10:34 | |
| *** Doe has joined #openstack-horizon | 10:35 | |
| *** exploreshaifali has quit IRC | 10:38 | |
| *** exploreshaifali has joined #openstack-horizon | 10:50 | |
| *** Doe has quit IRC | 11:00 | |
| *** Doe has joined #openstack-horizon | 11:00 | |
| *** cedrics has joined #openstack-horizon | 11:07 | |
| *** Doe has quit IRC | 11:10 | |
| *** jtomasek has joined #openstack-horizon | 11:12 | |
| *** cedrics has quit IRC | 11:16 | |
| *** exploreshaifali has quit IRC | 11:18 | |
| *** lhcheng has joined #openstack-horizon | 11:23 | |
| *** lhcheng has quit IRC | 11:28 | |
| *** enykeev has quit IRC | 11:30 | |
| *** nikunj2512 has quit IRC | 11:40 | |
| *** jtomasek has quit IRC | 11:41 | |
| *** vijendar has joined #openstack-horizon | 11:42 | |
| *** lhcheng has joined #openstack-horizon | 11:55 | |
| *** lhcheng has quit IRC | 12:00 | |
| *** cedrics has joined #openstack-horizon | 12:04 | |
| *** Doe has joined #openstack-horizon | 12:07 | |
| *** exploreshaifali has joined #openstack-horizon | 12:08 | |
| *** cedrics has quit IRC | 12:12 | |
| *** exploreshaifali has quit IRC | 12:14 | |
| *** e0ne has joined #openstack-horizon | 12:21 | |
| *** cedrics has joined #openstack-horizon | 12:44 | |
| *** cedrics has quit IRC | 12:53 | |
| *** Longgeek_ has joined #openstack-horizon | 12:55 | |
| *** lhcheng has joined #openstack-horizon | 12:56 | |
| *** Longgeek has quit IRC | 12:58 | |
| *** lhcheng has quit IRC | 13:00 | |
| *** ramishra has joined #openstack-horizon | 13:17 | |
| *** e0ne has quit IRC | 13:31 | |
| *** jtomasek has joined #openstack-horizon | 13:32 | |
| *** jacalcat has joined #openstack-horizon | 13:42 | |
| *** cedrics has joined #openstack-horizon | 13:44 | |
| *** Doe has quit IRC | 13:44 | |
| *** Doe has joined #openstack-horizon | 13:44 | |
| *** denis_makogon has joined #openstack-horizon | 13:48 | |
| *** cedrics has quit IRC | 13:52 | |
| *** cedrics has joined #openstack-horizon | 13:55 | |
| *** lhcheng has joined #openstack-horizon | 13:56 | |
| *** Doe has quit IRC | 13:57 | |
| *** Doe has joined #openstack-horizon | 13:58 | |
| *** lhcheng has quit IRC | 14:01 | |
| *** cedrics has quit IRC | 14:04 | |
| *** jacalcat has quit IRC | 14:05 | |
| *** dsneddon_ has quit IRC | 14:06 | |
| *** denis_makogon has quit IRC | 14:06 | |
| *** cedrics has joined #openstack-horizon | 14:07 | |
| *** dsneddon_ has joined #openstack-horizon | 14:08 | |
| *** Doe has quit IRC | 14:12 | |
| *** Doe has joined #openstack-horizon | 14:13 | |
| *** cedrics has quit IRC | 14:16 | |
| *** Doe has quit IRC | 14:34 | |
| *** Doe has joined #openstack-horizon | 14:34 | |
| *** colinmcnamara has joined #openstack-horizon | 14:41 | |
| *** Doe has quit IRC | 14:44 | |
| *** Doe has joined #openstack-horizon | 14:44 | |
| *** dsneddon_ has quit IRC | 14:48 | |
| *** dsneddon_ has joined #openstack-horizon | 14:49 | |
| *** Doe has quit IRC | 14:49 | |
| *** Doe has joined #openstack-horizon | 14:49 | |
| *** lhcheng has joined #openstack-horizon | 14:57 | |
| *** lhcheng has quit IRC | 15:02 | |
| *** cedrics has joined #openstack-horizon | 15:04 | |
| *** kutija has joined #openstack-horizon | 15:04 | |
| *** alexpilotti has quit IRC | 15:11 | |
| *** cedrics has quit IRC | 15:13 | |
| *** exploreshaifali has joined #openstack-horizon | 15:14 | |
| *** Drago has joined #openstack-horizon | 15:20 | |
| *** colinmcnamara has quit IRC | 15:21 | |
| *** Drago has quit IRC | 15:25 | |
| *** ramishra has quit IRC | 15:30 | |
| exploreshaifali | thiagop, https://review.openstack.org/#/c/126141/ | 15:30 |
| *** e0ne has joined #openstack-horizon | 15:34 | |
| *** e0ne has quit IRC | 15:36 | |
| *** alexpilotti has joined #openstack-horizon | 15:38 | |
| *** jacalcat has joined #openstack-horizon | 15:40 | |
| *** e0ne has joined #openstack-horizon | 15:40 | |
| *** Longgeek_ has quit IRC | 15:43 | |
| *** e0ne has quit IRC | 15:43 | |
| *** Longgeek has joined #openstack-horizon | 15:43 | |
| *** Longgeek_ has joined #openstack-horizon | 15:44 | |
| *** alexpilotti_ has joined #openstack-horizon | 15:44 | |
| *** Longgeek has quit IRC | 15:45 | |
| *** e0ne has joined #openstack-horizon | 15:47 | |
| *** alexpilotti has quit IRC | 15:47 | |
| *** alexpilotti_ is now known as alexpilotti | 15:47 | |
| *** e0ne has quit IRC | 15:51 | |
| *** e0ne has joined #openstack-horizon | 15:55 | |
| *** sbfox has joined #openstack-horizon | 15:57 | |
| *** lhcheng has joined #openstack-horizon | 15:58 | |
| *** e0ne has quit IRC | 15:59 | |
| *** ZZelle has quit IRC | 16:00 | |
| *** ZZelle has joined #openstack-horizon | 16:00 | |
| *** lhcheng has quit IRC | 16:02 | |
| *** e0ne has joined #openstack-horizon | 16:04 | |
| *** cedrics has joined #openstack-horizon | 16:04 | |
| *** e0ne has quit IRC | 16:05 | |
| *** Longgeek_ has quit IRC | 16:09 | |
| *** Longgeek has joined #openstack-horizon | 16:10 | |
| *** Dafna has quit IRC | 16:11 | |
| *** kutija has quit IRC | 16:12 | |
| *** cedrics has quit IRC | 16:13 | |
| *** Longgeek has quit IRC | 16:16 | |
| *** Doe has quit IRC | 16:21 | |
| *** cedrics has joined #openstack-horizon | 16:24 | |
| *** e0ne has joined #openstack-horizon | 16:26 | |
| *** e0ne has quit IRC | 16:28 | |
| *** sbfox has quit IRC | 16:28 | |
| *** e0ne has joined #openstack-horizon | 16:31 | |
| *** e0ne has quit IRC | 16:33 | |
| *** e0ne has joined #openstack-horizon | 16:37 | |
| *** e0ne has quit IRC | 16:40 | |
| *** cedricss has joined #openstack-horizon | 16:43 | |
| *** cedrics has quit IRC | 16:43 | |
| *** e0ne has joined #openstack-horizon | 16:44 | |
| *** e0ne has quit IRC | 16:45 | |
| *** e0ne has joined #openstack-horizon | 16:49 | |
| *** cedricss has quit IRC | 16:56 | |
| *** sayali has joined #openstack-horizon | 16:56 | |
| *** e0ne has quit IRC | 16:58 | |
| *** lhcheng has joined #openstack-horizon | 16:59 | |
| *** lhcheng has quit IRC | 17:03 | |
| *** dsneddon_ has quit IRC | 17:14 | |
| *** dsneddon_ has joined #openstack-horizon | 17:16 | |
| *** cedrics has joined #openstack-horizon | 17:43 | |
| *** cedrics has quit IRC | 17:52 | |
| *** alexpilotti has quit IRC | 17:59 | |
| *** esp has left #openstack-horizon | 18:17 | |
| *** cedrics has joined #openstack-horizon | 18:19 | |
| *** mitz has quit IRC | 18:23 | |
| *** cedrics has quit IRC | 18:27 | |
| *** Drago has joined #openstack-horizon | 18:28 | |
| *** mitz has joined #openstack-horizon | 18:30 | |
| *** echevemaster has joined #openstack-horizon | 18:32 | |
| *** Doe has joined #openstack-horizon | 18:49 | |
| *** Drago has quit IRC | 19:04 | |
| *** Longgeek has joined #openstack-horizon | 19:12 | |
| *** Doe has quit IRC | 19:14 | |
| *** Longgeek has quit IRC | 19:16 | |
| *** cedrics has joined #openstack-horizon | 19:27 | |
| *** exploreshaifali has quit IRC | 19:38 | |
| *** Drago has joined #openstack-horizon | 19:40 | |
| *** sayali has quit IRC | 19:40 | |
| *** jacalcat has quit IRC | 19:45 | |
| *** Drago has quit IRC | 19:45 | |
| *** Drago has joined #openstack-horizon | 19:46 | |
| *** Drago has quit IRC | 19:56 | |
| *** Drago has joined #openstack-horizon | 20:02 | |
| *** Drago has quit IRC | 20:02 | |
| *** Drago has joined #openstack-horizon | 20:02 | |
| *** cedrics has quit IRC | 20:05 | |
| *** e0ne has joined #openstack-horizon | 20:14 | |
| *** e0ne has quit IRC | 20:17 | |
| *** e0ne has joined #openstack-horizon | 20:20 | |
| *** lhcheng has joined #openstack-horizon | 20:20 | |
| *** e0ne has quit IRC | 20:23 | |
| *** e0ne has joined #openstack-horizon | 20:25 | |
| *** jacalcat has joined #openstack-horizon | 20:27 | |
| *** e0ne has quit IRC | 20:30 | |
| *** e0ne has joined #openstack-horizon | 20:34 | |
| *** e0ne has quit IRC | 20:36 | |
| *** e0ne has joined #openstack-horizon | 20:39 | |
| *** e0ne has quit IRC | 20:42 | |
| *** colinmcnamara has joined #openstack-horizon | 20:44 | |
| *** e0ne has joined #openstack-horizon | 20:45 | |
| *** e0ne has quit IRC | 20:47 | |
| *** Drago has quit IRC | 20:50 | |
| *** e0ne has joined #openstack-horizon | 20:51 | |
| *** e0ne has quit IRC | 20:52 | |
| *** lhcheng has quit IRC | 21:04 | |
| *** lhcheng has joined #openstack-horizon | 21:04 | |
| *** lhcheng has quit IRC | 21:09 | |
| *** lhcheng has joined #openstack-horizon | 21:33 | |
| *** colinmcnamara has quit IRC | 21:34 | |
| *** lhcheng has quit IRC | 21:38 | |
| *** lhcheng has joined #openstack-horizon | 21:38 | |
| *** jacalcat has quit IRC | 21:45 | |
| *** lhcheng has quit IRC | 21:47 | |
| *** lhcheng has joined #openstack-horizon | 21:48 | |
| *** jacalcat has joined #openstack-horizon | 21:53 | |
| *** dsneddon_ has quit IRC | 22:02 | |
| *** dsneddon_ has joined #openstack-horizon | 22:04 | |
| *** jacalcat has quit IRC | 22:06 | |
| *** alexpilotti has joined #openstack-horizon | 22:10 | |
| *** aix has quit IRC | 22:14 | |
| *** Drago has joined #openstack-horizon | 22:25 | |
| *** Drago has quit IRC | 22:38 | |
| *** dsneddon_ has quit IRC | 23:08 | |
| *** dsneddon_ has joined #openstack-horizon | 23:10 | |
| *** nlahouti has joined #openstack-horizon | 23:12 | |
| *** nlahouti has quit IRC | 23:12 | |
| *** nlahouti has joined #openstack-horizon | 23:12 | |
| *** Drago has joined #openstack-horizon | 23:23 | |
| *** Drago has quit IRC | 23:25 | |
| *** sigmavirus24_awa is now known as sigmavirus24 | 23:29 | |
| *** ZZelle_ has quit IRC | 23:46 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!