Git rebase

[Juan Pablo Gardella]

Hi contributors,

I did a commit (A) and pushed the changes to be reviewed. After that I did some pulls and merges locally. Then my history contains the merge M:

M

|  \

B |

|  /

A

I completed my changes and with some rebase commands I was able to have:

A

|

B

But when I tried to push the changes I saw the following error:

remote: Processing changes: refs: 1, done

remote:

remote: ERROR:  In commit xxxxxxxxxxxxxxx

remote: ERROR:  author email address x...@xxx.com

remote: ERROR:  does not match your user account.

remote: ERROR:

remote: ERROR:  The following addresses are currently registered:

remote: ERROR:    x...@gmail.com

remote: ERROR:

remote: ERROR:  To register an email address, please visit:

remote: ERROR:  https://gwt-review.googlesource.com/#/settings/contact

remote:

remote:

Do you know how to solve this problem?

Thanks

[Jens]

As the error message says your git commit has an author whose email address is not the one you use with your Gerrit user account. To update the author of your commit you need to do something like: http://stackoverflow.com/a/3042512

-- J.

[Juan Pablo Gardella]

My author is correct, but after the rebase the error is related to a commit that I'm not owner. I had to pull the repository again and fetch my changes again, after that, I made the changes and pushed them. I don't know how to solve that without pull the full repository again.

On 24 June 2015 at 07:06, Jens <jens.ne...@gmail.com> wrote:

As the error message says your git commit has an author whose email address is not the one you use with your Gerrit user account. To update the author of your commit you need to do something like: http://stackoverflow.com/a/3042512

-- J.

--
You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email to google-web-toolkit-co...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/google-web-toolkit-contributors/3e2aeed3-33d4-49d6-bde6-39f12ae57432%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Jens]

My author is correct, but after the rebase the error is related to a commit that I'm not owner. I had to pull the repository again and fetch my changes again, after that, I made the changes and pushed them. I don't know how to solve that without pull the full repository again.

Oh seems like your rebase action has also rewritten some commits that you don't own. Of course thats bad.

I would advice you to always create a local branch for each contribution. Then when you want to incorporate changes of master into your local contribution branch you switch back to master branch, pull changes and then rebase your local contribution branch on top of master. In the process of rebasing you might need to fix conflicts and then continue rebasing.

That way you avoid merge commits and you can work on multiple contributions while others are still in review. You can also have multiple contributions in one branch if they depend on each other. For example I have a java8-emul branch which provides java.util.function emulation and that same branch also has commits for emulating java.util.Optional and others as they depend on java.util.function.

-- J.

[Juan Pablo Gardella]

Thanks a lot Jens, I will do that in my next contribution.

--

You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email to google-web-toolkit-co...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/google-web-toolkit-contributors/9a94a66a-3593-48b2-aec5-0e23c0ab6111%40googlegroups.com.