[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
Re: [egit-dev] Problems pushing to Gerrit
|
1. Set your config to rebase when pulling to avoid getting such merges.
2. To fix this, rebase your change onto origin/master. Maybe the most intuitive way is to create & checkout a new branch based on origin/master, and then cherry-picking 638c1e8 onto that, then push to Gerrit again.
Cheers,
Thomas
On Jan 19, 2017, at 10:42, Wim Jongman <wim.jongman@xxxxxxxxx> wrote:
> Hi,
>
> Wim
>
> [1]--------------------------------------------------------------------------------------------
> Use the JGit API for branch name normalization.
>
> JGit contains a method to normalize the branch name.
> Normalization is delegated to that method
>
> Bug: 509878
> Change-Id: I92a29d7af2addc134c47ac12d68c01e42c66d76e
> Signed-off-by: Wim Jongman <wim.jongman@xxxxxxxxxxxxxxxxxx>
>
>
> [2] ---------------------------------------------------------------------------------------------
> Repository https://git.eclipse.org/r/egit/egit.git
>
> missing Change-Id in commit message footer
> Processing changes: refs: 1
> Processing changes: refs: 1, done
> ERROR: missing Change-Id in commit message footer
>
> Hint: To automatically insert Change-Id, install the hook:
> gitdir=$(git rev-parse --git-dir); scp -p -P 29418 wjongman@xxxxxxxxxxxxxxx:hooks/commit-msg ${gitdir}/hooks/
> And then amend the commit:
> git commit --amend
>
> [3] ---------------------------------------------------------------------------------------------
> <image.png>
> _______________________________________________
> egit-dev mailing list
> egit-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/egit-dev