Bugzilla – Full Text Bug Listing
| Summary: | rebase problems | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Tim Kaiser <tim.kaiser> | ||||
| Component: | Core | Assignee: | Project Inbox <egit.core-inbox> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | CC: | jens.baumgart, matthias.sohn, remy.suen | ||||
| Version: | 1.2 | ||||||
| Target Milestone: | 1.2 | ||||||
| Hardware: | PC | ||||||
| OS: | Windows 7 | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
You may want to check your 'Git Staging' view to see if there was anything in there. There may have been a conflict that needed to be resolved. Thanks for your hint. We have been successful resolving the local state using rebase on the command line. I checked Tim's Git repository. It somehow happened that commit messages contain \r characters. A commit message should only contain \n. The \r characters are then contained in the return of RevCommit.getShortMessage and cause rebase to fail. Furthermore the history view does not show commit messages for commits containing \r. Fix proposed: http://egit.eclipse.org/r/4386 Additional fixes in JGit are required to handle exisiting commits with \r in the commit message. Mylyn generates my commit messages. Maybe that is the source of \r. Do you have the latest mylyn version? I tried mylyn and did not get \r. I use mylyn 3.6.0 merged as abd4106f8de2f72d32c81d6e76355aa20ca4e175 |
Created attachment 205584 [details] exceptions Hi, I committed changes to the local branch, then i did a pull (with rebase strategy) and ended up in the "rebase interactive" state and got the attached exceptions. I do not know how to proceed from here. I interact with GIT through the eclipse UI solely. I use yesterday's nightly build, but i experienced the problem with earlier versions as well. Previously, i helped myself using a reset but my changes were lost. Best, Tim