|Merge + Squash does not change MERGE_HEAD? [message #993721]
||Tue, 25 December 2012 08:39
| Tal Weiss
Registered: October 2011
When merging using "Squash" and later committing, Git history does not show the branch as merged.|
In Pydev Package Explorer, right click on the project in the Master branch.
Team - Merge
Select a local branch
In the merge options select Squash
Click on the Merge button
The merge happens in my workspace without a commit (so far so good).
I review the code, possibly modifying it slightly and commit.
Commit works, but the branch is not really merged.
In the history view (or git log --decorate --graph --oneline) I don't see the merge.
When I try to delete the branch it tells me that it has unmerged commits.
Am I using merge-squash wrong?
[Updated on: Tue, 25 December 2012 08:40]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.01647 seconds