After git rebase -i, you need to edit the line of the newer commit to be:
squash <SHA1> <commit message>
instead of:
pick <SHA1> <commit message>
On Tue, May 23, 2017 at 1:18 PM, shubham dubey <sdubey504(a)gmail.com> wrote:
I have run 'git rebase -i HEAD~2' but they doesn't
merge.
I think I need to change pick with edit for merging but I didn't do that,
thats why they are still
separate commit.
On Tue, May 23, 2017 at 3:37 PM, Martin Perina <mperina(a)redhat.com> wrote:
> Please merge upgrade script into previous patch, otherwise CI will always
> fail for your patch
>
> On Tue, May 23, 2017 at 11:57 AM, shubham dubey <sdubey504(a)gmail.com>
> wrote:
>
>> Done. They are not coming in single page but in related changes.
>>
>> Thanks
>>
>> On Tue, May 23, 2017 at 3:21 PM, shubham dubey <sdubey504(a)gmail.com>
>> wrote:
>>
>>> So,what I do for now?
>>> Can I can now add the new file to previous change?
>>>
>>> On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina(a)redhat.com>
>>> wrote:
>>>
>>>> You cannot, but for future you need have the same Change-Id for a
>>>> patch, this is how gerrit identifies patches.
>>>>
>>>> On Tue, May 23, 2017 at 11:43 AM, shubham dubey
<sdubey504(a)gmail.com>
>>>> wrote:
>>>>
>>>>> I just use 'git push origin HEAD:refs/for/master'
>>>>> but it comes as new commit.
>>>>>
>>>>> How I merge both?
>>>>>
>>>>> On Tue, May 23, 2017 at 3:05 PM, Martin Perina
<mperina(a)redhat.com>
>>>>> wrote:
>>>>>
>>>>>> Just add a file into the patch locally and push it again to
gerrit,
>>>>>> patch will be stored as new patch set.
>>>>>>
>>>>>> On Tue, May 23, 2017 at 11:33 AM, shubham dubey
<sdubey504(a)gmail.com
>>>>>> > wrote:
>>>>>>
>>>>>>> yes I just forget to add that.
>>>>>>> Can anyone tell me how to push the new changes to same
commit?
>>>>>>>
>>>>>>> Thanks,
>>>>>>> Shubham
>>>>>>>
>>>>>>> On Tue, May 23, 2017 at 1:27 PM, Code Review
<gerrit(a)ovirt.org>
>>>>>>> wrote:
>>>>>>>
>>>>>>>> From Eli Mesika <emesika(a)redhat.com>:
>>>>>>>>
>>>>>>>> Eli Mesika has posted comments on this change.
>>>>>>>>
>>>>>>>> Change subject: core: backup flag added to storage domain
static
>>>>>>>>
............................................................
>>>>>>>> ..........
>>>>>>>>
>>>>>>>>
>>>>>>>> Patch Set 1:
>>>>>>>>
>>>>>>>> Did you forgot to add the relevant upgrade script that
added that
>>>>>>>> field ????
>>>>>>>>
>>>>>>>> --
>>>>>>>> To view, visit
https://gerrit.ovirt.org/77142
>>>>>>>> To unsubscribe, visit
https://gerrit.ovirt.org/settings
>>>>>>>>
>>>>>>>> Gerrit-MessageType: comment
>>>>>>>> Gerrit-Change-Id:
I1453b52f4330d0e5cb12d8fa08426fd68f3cd329
>>>>>>>> Gerrit-PatchSet: 1
>>>>>>>> Gerrit-Project: ovirt-engine
>>>>>>>> Gerrit-Branch: master
>>>>>>>> Gerrit-Owner: shubham dubey <sdubey504(a)gmail.com>
>>>>>>>> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
>>>>>>>> Gerrit-Reviewer: Greg Sheremeta
<gshereme(a)redhat.com>
>>>>>>>> Gerrit-Reviewer: Jenkins CI
>>>>>>>> Gerrit-Reviewer: Maor Lipchuk
<mlipchuk(a)redhat.com>
>>>>>>>> Gerrit-Reviewer: Martin Peřina
<mperina(a)redhat.com>
>>>>>>>> Gerrit-Reviewer: gerrit-hooks
<automation(a)ovirt.org>
>>>>>>>> Gerrit-HasComments: No
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
>
_______________________________________________
Devel mailing list
Devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/devel