Eclipse Community Forums: EGit » Merge + Squash does not change MERGE

Help

Home

Home » Eclipse Projects » EGit » Merge + Squash does not change MERGE_HEAD?

Show: Today's Messages :: Show Polls :: Message Navigator

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

[Message index]

		Merge + Squash does not change MERGE_HEAD? By: Tal Weiss on Tue, 25 December 2012 03:39
		Re: Merge + Squash does not change MERGE_HEAD? By: Matthias Sohn on Wed, 09 January 2013 17:08
		Re: Merge + Squash does not change MERGE_HEAD? By: Stefan Lay on Thu, 10 January 2013 03:09

Previous Topic:	Mylyn Github task repository responds with connection refused
Next Topic:	Single file is shown several times in commit dialog

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue May 21 07:09:29 EDT 2013