Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ptp-dev] GUI Term commit issue

I tried a number of things. The latest was this:

Start a new repo:
git clone ssh://sbrandtn08@xxxxxxxxxxxxxxx:29418/ptp/org.eclipse.ptp

Get it to the right version
git fetch git://git.eclipse.org/gitroot/ptp/org.eclipse.ptp refs/changes/27/17427/2 && git cherry-pick FETCH_HEA

I then put the changes in I wanted in, and committed with amend. This gets rejected because "fast fowards" are not allowed.

Googling says to solve this, I have to do a git pull. If I do a git pull, then there are multiple commits in my history and they aren't all signed off by me, so Gerrit rejects.

I'm thinking that the only way out of this problem is to kill https://git.eclipse.org/r/#/c/17427/ and start over. Any other thoughts?

Cheers,
Steve


Back to the top