Thanks a lot Jens, I will do that in my next contribution. On 24 June 2015 at 07:35, Jens <[email protected]> wrote:
> > 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. > > -- > 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 [email protected]. > 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 > <https://groups.google.com/d/msgid/google-web-toolkit-contributors/9a94a66a-3593-48b2-aec5-0e23c0ab6111%40googlegroups.com?utm_medium=email&utm_source=footer> > . > > For more options, visit https://groups.google.com/d/optout. > -- 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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/google-web-toolkit-contributors/CA%2BkiFsfP7CZAJuxFykHz4ycCD_roxo9_CFo%2BgrfUB23c8MXF5w%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
