| Merge + Squash does not change MERGE_HEAD? [message #993721] |
Tue, 25 December 2012 03:39  |
 Tal Weiss
Messages: 4
Registered: October 2011 |
Junior Member |
|
|
When merging using "Squash" and later committing, Git history does not show the branch as merged.
My procedure:
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 03:40] Report message to a moderator |
|
|
|
| Re: Merge + Squash does not change MERGE_HEAD? [message #998548 is a reply to message #998380] |
Thu, 10 January 2013 03:09  |
Stefan Lay
Messages: 333
Registered: July 2009 |
Senior Member |
|
|
Matthias, the community is working hard;-) Squash was implemented by Tomasz in August last year.
Tal, in my opinion merge-squash works as designed. Please have a look at the git docu (http://www.kernel.org/pub/software/scm/git/docs/git-merge.html):
"Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch"
So, in a nutshell, merge-squash does not merge in the branch but only takes the changes introduced by the branch.
|
|
|
Powered by
FUDForum. Page generated in 0.02965 seconds
] 
Search
Help
Register
Login
Home
