|Commit/amend not possible [message #968531]
||Fri, 02 November 2012 14:32
| Eugene Kondrashev
Registered: January 2012
I'm experiencing some unexpected behavior while performing merge through "Team Synchronizing" perspective.
All actions with A repository is done through the command line.
All actions with B repository is done through egit UI. Exception is cherry pick operation which is done with jgit(or command line).
Consider such scenario:
1. There is none-bare A repository
2. Perform initial commit to A - A contains AC1
2. Clone B from A, so A is a remote repository for B - B contains AC1
3. Perform another commit to A, changing 1.txt - A contains AC1-AC2
4. Cherry-pick AC2 to B (with console or jgit) - B contains AC1-AC2'
5. Perform commit to B, changing 1.txt - B contains AC1-AC2'-BC3
6. Click Team->Synchronize Workspace
7. Synchronize view shows that there are two outgoing commits pending(AC2', BC3) and one incoming(AC2).
8. Click "Pull" - egit shows "Merged master |2|1" status for B repository
9. Resolve conflicts for 1.txt file, leaving HEAD version.
10 Click "Add to Index" against 1.txt - egit shows "Conflicts master |2|1" status for B repository
11. Try to commit merge commit - got "Commit/amend not possible" message
If I leave origin/master version of 1.txt, I can successfully perform commit after adding resolved file to index.
My guess that egit doesn't allow to perform merge commit if nothing is changed comparing to last local commit, which is my case as I'm leaving HEAD version. But I do need to perform merge commit, to be able to push to A.
So why I'm not able to perform merge commit, after leaving HEAD version of a file?
Any comments appreciated.
[Updated on: Mon, 12 November 2012 12:59]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.13522 seconds