| *** jeromatron has quit IRC | 00:41 | |
| *** crxz0193 has joined #magnetodb | 03:21 | |
| *** crxz0193 has quit IRC | 04:20 | |
| *** crxz0193_ has joined #magnetodb | 04:20 | |
| *** crxz0193 has joined #magnetodb | 04:20 | |
| *** crxz0193 has joined #magnetodb | 04:23 | |
| *** crxz0193 has quit IRC | 06:22 | |
| *** crxz0193_ has quit IRC | 06:22 | |
| *** crxz0193 has joined #magnetodb | 06:23 | |
| *** pas-ha has joined #magnetodb | 06:43 | |
| achuprin_ | Hi team! | 06:47 |
|---|---|---|
| boris-42 | achuprin_ hi there | 06:47 |
| *** crxz0193 has quit IRC | 07:29 | |
| *** crxz0193 has joined #magnetodb | 07:48 | |
| *** achuprin_ has quit IRC | 07:57 | |
| *** achuprin has joined #magnetodb | 07:57 | |
| *** crxz0193 has quit IRC | 08:05 | |
| *** jeromatron has joined #magnetodb | 08:15 | |
| *** crxz0193 has joined #magnetodb | 08:23 | |
| isviridov | Hello everybody | 08:28 |
| *** miarmak has joined #magnetodb | 08:30 | |
| miarmak | hello! | 08:30 |
| *** idegtiarov has joined #magnetodb | 08:43 | |
| *** dmakogon_ is now known as denis_makogon | 08:57 | |
| *** ominakov has joined #magnetodb | 08:59 | |
| ominakov | hi guys | 09:02 |
| miarmak | ominakov: hello | 09:04 |
| *** achuprin has quit IRC | 11:58 | |
| *** achuprin has joined #magnetodb | 11:58 | |
| *** jeromatron has quit IRC | 12:06 | |
| *** jeromatron has joined #magnetodb | 12:10 | |
| *** volmax has quit IRC | 12:27 | |
| *** crxz0193 has quit IRC | 12:27 | |
| openstackgerrit | Dmitriy Ukhlov proposed a change to stackforge/magnetodb: Fix small bugs https://review.openstack.org/85713 | 13:34 |
| *** volmax has joined #magnetodb | 13:53 | |
| volmax | Hi everybody | 13:53 |
| miarmak | volmax: hi! | 13:53 |
| *** achuprin has quit IRC | 13:56 | |
| *** achuprin has joined #magnetodb | 14:28 | |
| openstackgerrit | Dmitriy Ukhlov proposed a change to stackforge/magnetodb: Fix small bugs https://review.openstack.org/85713 | 14:29 |
| *** achuprin has quit IRC | 14:33 | |
| *** CharlesW has joined #magnetodb | 14:44 | |
| CharlesW | Hi guys. How do you resolve conflict when you rebase/merge from master in your bug/bp branch? | 14:45 |
| miarmak | CharlesW: hello! | 14:50 |
| CharlesW | Hi miaemak | 14:52 |
| miarmak | CharlesW: actually, we create our branch from master, work there, commit and after that doing 'git rebase master' (master should be updated). If it is no conflicts, git rebase it itself. And if it is conflict - manually, with help of some resolve conflict tool (I am using PyCharm for this, someone VIM +plugins) | 14:52 |
| dukhlov__ | CharlesW: I use meld which is default merge tool in ubuntu | 14:55 |
| miarmak | CharlesW: here you can find more info: https://wiki.openstack.org/wiki/Gerrit_Workflow#Long-lived_Topic_Branches | 14:55 |
| dukhlov__ | just execute "git mergetool" | 14:56 |
| CharlesW | I tried git fetch --all; git pull --rebase origin master(not sure about this, also tried git rebase gerrit/origin); git mergetool; git rebase --continue. Does that look like the right steps? | 14:59 |
| miarmak | CharlesW: I can share you my workflow. Usually I have 2 local branches: master and my-feature-branch (created from actual master). So, I make a feature, make a commit. after that, switch master (git checkout master) and update it (git remote update; git pull origin master). After this switch back to my branch (git checkout my-feature-branch). And in the end, I do 'git rebase master'. if it is conflict - I go to PyCharm, resolve conflicts there and back | 15:10 |
| miarmak | to CLI. there it is 'git rebase --continue'. Sometimes, it is needed to do smth like git add/rm <file> | 15:10 |
| miarmak | that's it) | 15:10 |
| *** idegtiarov has quit IRC | 15:15 | |
| pas-ha | CharlesW: good read - https://wiki.openstack.org/wiki/GerritWorkflow | 15:29 |
| pas-ha | oops, was already mentioned.. sorry for double positng | 15:29 |
| miarmak | pas-ha: =) | 15:51 |
| CharlesW | Thanks guys, I'll take a look | 15:58 |
| miarmak | you're welcome! | 16:01 |
| *** jeromatron has quit IRC | 16:20 | |
| *** jeromatron has joined #magnetodb | 16:22 | |
| *** denis_makogon has quit IRC | 16:47 | |
| *** dmakogon_ has joined #magnetodb | 16:47 | |
| miarmak | bye guys | 17:05 |
| *** crxz0193 has joined #magnetodb | 17:05 | |
| *** ominakov has quit IRC | 17:28 | |
| CharlesW | miarmak, when do you have to do git add/rm resolving conflicts? Add/remove files in branch conflict with master? | 17:28 |
| *** crxz0193 has quit IRC | 17:33 | |
| openstackgerrit | Illia Khudoshyn proposed a change to stackforge/magnetodb: PoC Bulk data load over network https://review.openstack.org/85574 | 17:42 |
| *** CharlesW has quit IRC | 18:01 | |
| *** ominakov has joined #magnetodb | 19:15 | |
| *** ominakov has quit IRC | 19:15 | |
| *** jeromatron has quit IRC | 19:25 | |
| *** jeromatron has joined #magnetodb | 20:09 | |
| *** boris-42 has quit IRC | 20:10 | |
| *** jeromatron has quit IRC | 20:20 | |
| *** boris-42 has joined #magnetodb | 20:28 | |
| *** jeromatron has joined #magnetodb | 20:31 | |
| *** jeromatron has quit IRC | 21:11 | |
| *** jeromatron has joined #magnetodb | 21:18 | |
| openstackgerrit | Illia Khudoshyn proposed a change to stackforge/magnetodb: PoC Bulk data load over network https://review.openstack.org/85574 | 22:33 |
| *** jeromatron has quit IRC | 22:46 | |
| openstackgerrit | Illia Khudoshyn proposed a change to stackforge/magnetodb: PoC Bulk data load over network https://review.openstack.org/85574 | 23:33 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!