After git rebase -i, you need to edit the line of the newer commit to be:
squash
instead of:
pick
On Tue, May 23, 2017 at 1:18 PM, shubham dubey 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,
> t
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 wrote:
> Please merge upgrade script into previous patch, otherwise CI will
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 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
> wrote:
>
>> So,
Done. They are not coming in single page but in related changes.
Thanks
On Tue, May 23, 2017 at 3:21 PM, shubham dubey 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 wrote:
>
>> You cannot, but for future y
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 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
On Tue, May 23, 2017 at 11:47 AM, Martin Perina wrote:
> You cannot, but for future you need have the same Change-Id for a patch,
> this is how gerrit identifies patches.
>
Ahh now I see your issue, you have created a new patch in your git locally
instead of ammending the previous one.
So you c
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 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
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 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
# initial push
git push gerrit.ovirt.org:ovirt-engine HEAD:refs/for/master
# edit some text
# amend the commit
git add [files]
git commit --amend
# re-push
git push gerrit.ovirt.org:ovirt-engine HEAD:refs/for/master
On Tue, May 23, 2017 at 5:35 AM, Martin Perina wrote:
> Just add a file into
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 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, Ma
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 wrote:
> From Eli Mesika :
>
> Eli Mesika has posted comments on this change.
>
> Change subject: core: backup flag added to storage domain
11 matches
Mail list logo
