| *** shakamunyi has joined #openstack-sahara | 00:35 | |
| *** julienvey has joined #openstack-sahara | 00:35 | |
| *** bob_nettleton has joined #openstack-sahara | 00:42 | |
| bob_nettleton | Hi All, I'm having some trouble with a merge, likely due to my lack of git expertise. gerritt reports that the merge for my patch couldn't be completed, and that I must rebase locally. I ran "git rebase" locally, and resubmitted. After a day's worth of testing, the merge failed again for the same reason. Is there more I need to do, other than "git rebase"? I'm assuming that I'm not running the correct commands to rebase things properl | 00:48 |
|---|---|---|
| _elmiko | bob_nettleton: did you rebase against master? | 00:50 |
| bob_nettleton | _elmiko, Hi Mike, I think I did. Last night, I ran "git rebase" with no args, and the online doc seemed to indicate that this would default to master. is that not the case? | 00:51 |
| _elmiko | i would think so, but you never know | 00:51 |
| _elmiko | you probably need to repull master to make sure it's up to date ,then rebase your branch against master | 00:52 |
| _elmiko | if all that fails, i sometimes find it easier to isolate my patch, make a new branch off master, then reapply the patch | 00:52 |
| *** ViswaV_ has quit IRC | 00:52 | |
| _elmiko | the Change-Id: value should keep everything straight with geritt | 00:53 |
| bob_nettleton | _elmiko, so that would involve a "git pull", then a "git rebase -i master"? I was worried that the "git pull" might create a new commit id? | 00:54 |
| _elmiko | first, git checkout master, then git pull, then git checkout branch, then git rebase -i master | 00:54 |
| _elmiko | as long as you keep your branch separate it shouldn't be a problem | 00:55 |
| _elmiko | for defense you might first git checkout -b backup_branch from your patch | 00:55 |
| _elmiko | according to the manpage for git-rebase, i think you will want to do `git rebase master` from your branch | 00:58 |
| bob_nettleton | _elmiko, thanks for the info! I think at least a part of the problem is that I started my commit on the master branch, and not on a topic branch as I should have. If I create the backup_branch, will that mess up my commit id? (Sorry for the annoying questions… :) ) | 01:01 |
| _elmiko | ok, if your patch is the last commit on master, then doing `git checkout -b backup`, will make a new branch with your commit as the HEAD | 01:02 |
| _elmiko | then, switch back to master and reset the master to HEAD~1 (head -1) | 01:02 |
| _elmiko | then you should be able to pull without conflict | 01:02 |
| _elmiko | and your backup branch will preserve the commit you did | 01:02 |
| _elmiko | finally, you should be able to `git rebase master` from the backup branch | 01:03 |
| _elmiko | and no need to apologize :) | 01:03 |
| _elmiko | oh, as for the Change-Id, it will be preserved in the commit log | 01:03 |
| _elmiko | if you really want to be safe, you can always make a backup of the entire project directory to somewhere else. that way if you mess up you can go to the backup copy. | 01:04 |
| _elmiko | e.g. cp -rf sahara sahara.backup | 01:04 |
| _elmiko | or somesuch | 01:04 |
| bob_nettleton | _elmiko, thanks! I'll give this a try. have a great weekend! | 01:05 |
| _elmiko | you too :) | 01:05 |
| *** bob_nettleton has quit IRC | 01:16 | |
| *** shakamunyi has quit IRC | 01:18 | |
| *** shakamunyi has joined #openstack-sahara | 01:22 | |
| *** tylerdurden has joined #openstack-sahara | 01:59 | |
| *** shakamunyi has quit IRC | 02:02 | |
| *** ViswaV has joined #openstack-sahara | 02:10 | |
| *** tylerdurden has quit IRC | 02:17 | |
| *** julienvey has quit IRC | 02:35 | |
| *** ViswaV has quit IRC | 02:58 | |
| *** julienvey has joined #openstack-sahara | 03:35 | |
| *** julienvey has quit IRC | 03:40 | |
| *** zhiyan_ has quit IRC | 03:41 | |
| *** zhiyan_ has joined #openstack-sahara | 04:08 | |
| *** julienvey has joined #openstack-sahara | 04:36 | |
| *** julienvey has quit IRC | 04:40 | |
| *** julienvey has joined #openstack-sahara | 05:36 | |
| *** julienvey has quit IRC | 05:42 | |
| *** _crobertsrh has quit IRC | 06:18 | |
| *** crobertsrh has joined #openstack-sahara | 06:27 | |
| *** julienvey has joined #openstack-sahara | 06:37 | |
| *** julienvey has quit IRC | 06:42 | |
| *** julienvey has joined #openstack-sahara | 07:38 | |
| *** julienvey has quit IRC | 07:43 | |
| *** akuznetsov has joined #openstack-sahara | 08:18 | |
| *** julienvey has joined #openstack-sahara | 08:39 | |
| *** julienvey has quit IRC | 08:44 | |
| *** witlessb has joined #openstack-sahara | 09:07 | |
| *** julienvey has joined #openstack-sahara | 09:40 | |
| *** julienvey has quit IRC | 09:44 | |
| *** julienvey has joined #openstack-sahara | 10:40 | |
| *** julienvey has quit IRC | 10:45 | |
| *** Longgeek has joined #openstack-sahara | 11:06 | |
| *** julienvey has joined #openstack-sahara | 11:41 | |
| *** julienvey has quit IRC | 11:46 | |
| *** xianghuihui has joined #openstack-sahara | 11:49 | |
| *** openstackgerrit has joined #openstack-sahara | 12:01 | |
| *** julienvey has joined #openstack-sahara | 12:42 | |
| *** julienvey has quit IRC | 12:46 | |
| *** shakamunyi has joined #openstack-sahara | 12:48 | |
| *** shakamunyi has quit IRC | 12:48 | |
| *** shakamunyi has joined #openstack-sahara | 12:49 | |
| *** shakamunyi has quit IRC | 13:14 | |
| *** shakayumi has joined #openstack-sahara | 13:14 | |
| *** shakayumi has quit IRC | 13:14 | |
| *** shakamunyi has joined #openstack-sahara | 13:16 | |
| *** shakamunyi has quit IRC | 13:16 | |
| *** shakamunyi has joined #openstack-sahara | 13:17 | |
| *** julienvey has joined #openstack-sahara | 13:43 | |
| *** julienvey has quit IRC | 13:47 | |
| *** xianghuihui has quit IRC | 14:06 | |
| *** xianghuihui has joined #openstack-sahara | 14:07 | |
| *** xianghuihui has quit IRC | 14:12 | |
| *** xianghuihui has joined #openstack-sahara | 14:12 | |
| -openstackstatus- NOTICE: Gerrit will be offline from 1500-1515 UTC for project renames | 14:39 | |
| *** ChanServ changes topic to "Gerrit will be offline from 1500-1515 UTC for project renames" | 14:39 | |
| *** julienvey has joined #openstack-sahara | 14:43 | |
| *** julienvey has quit IRC | 14:48 | |
| openstackgerrit | OpenStack Proposal Bot proposed a change to openstack/sahara: Updated from global requirements https://review.openstack.org/103336 | 15:16 |
| *** xianghuihui has quit IRC | 15:19 | |
| *** xianghui has joined #openstack-sahara | 15:39 | |
| *** julienvey has joined #openstack-sahara | 15:44 | |
| *** openstackgerrit has quit IRC | 15:46 | |
| *** openstackgerrit has joined #openstack-sahara | 15:46 | |
| *** julienvey has quit IRC | 15:49 | |
| *** ChanServ changes topic to "launchpad openid is down. login to openstack services will fail until launchpad openid is happy again" | 15:52 | |
| *** witlessb has quit IRC | 16:34 | |
| *** shakamunyi has quit IRC | 16:38 | |
| *** julienvey has joined #openstack-sahara | 16:45 | |
| *** julienvey has quit IRC | 16:50 | |
| *** ViswaV has joined #openstack-sahara | 17:18 | |
| *** ViswaV has quit IRC | 17:22 | |
| *** julienvey has joined #openstack-sahara | 17:46 | |
| *** julienvey has quit IRC | 17:50 | |
| openstackgerrit | Robert Nettleton proposed a change to openstack/sahara: Upgrades the HDP plugin to use Ambari 1.6.0 https://review.openstack.org/98260 | 17:52 |
| *** julienvey has joined #openstack-sahara | 18:46 | |
| *** julienvey has quit IRC | 18:51 | |
| *** julienvey has joined #openstack-sahara | 19:47 | |
| *** Longgeek has quit IRC | 19:51 | |
| *** julienvey has quit IRC | 19:52 | |
| *** shakamunyi has joined #openstack-sahara | 20:13 | |
| *** shakamunyi has quit IRC | 20:18 | |
| *** shakamunyi has joined #openstack-sahara | 20:34 | |
| *** witlessb has joined #openstack-sahara | 20:37 | |
| *** julienvey has joined #openstack-sahara | 20:48 | |
| *** julienvey has quit IRC | 20:53 | |
| *** ViswaV has joined #openstack-sahara | 21:19 | |
| *** ViswaV has quit IRC | 21:23 | |
| *** julienvey has joined #openstack-sahara | 21:39 | |
| *** julienvey has quit IRC | 21:44 | |
| *** shakamunyi has quit IRC | 22:08 | |
| *** julienvey has joined #openstack-sahara | 22:40 | |
| *** julienvey has quit IRC | 22:44 | |
| *** witlessb has quit IRC | 23:29 | |
| *** julienvey has joined #openstack-sahara | 23:41 | |
| *** julienve_ has joined #openstack-sahara | 23:45 | |
| *** julienvey has quit IRC | 23:45 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!