tags:

views:

81

answers:

1
+3  Q: 

Strange git merge issue

This is how gitk currently looks in one of our projects:

https://dl.dropbox.com/u/2582508/gitk.png

This apparently, from all we can tell, happened after a single "git merge" was done with a remote branch - we're not sure why or what is going on. Any idea what happened here?

More importantly, what's the best way to fix it? Those merge commits are empty, but when doing "git rebase -i" merge commits generally don't seem to appear.

Most importantly, I would prefer to not make the history incompatible with other clones, i.e. they should still able to pull/push/merge with it. Is that even possible?

+2  A: 
Pat Notz  2010-02-18 19:52:07
Thanks for your answer. However, I either don't understand it, or I wasn't clear in my question. I understand merge commits, and I'm fine to have them in the central repo - I don't think we want to use rebase here. But in the screenshot above I have smth. like 30 subsequent merges, each with two parents: the direct previous merge, and one in a series of older commits. There weren't 30 develop-merge-develop steps. And while I find it difficult understanding these kinds of trees, the merges also seem unnecessary to me. A single one (or few) could have accomplished the goal you describe.
miracle2k  2010-02-20 06:34:10

related questions

How to have two remote orgins for Git?
Why is branching and merging easier in Mercurial than in Subversion?
Is there a better way of writing a git pre-commit hook to check any php file in a commit for parse errors ?
Bug tracker setup with Git integration?
Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?
git-stash vs. git-branch
Git "bad sha1 file" error
Should I use GitHub+Fogbugz or Assembla?
How do you remove a specific revision in the git history?
How do you organise multiple git repositories?
What is the Difference Between Mercurial and Git?
How do I restore files to previous states in git?
Is there anything like TortoiseCVS and TortoiseSVN for git?
Good Git repository viewer for Mac
Deploying a Git subdirectory in Capistrano
How to "unversion" a file in either svn and/or git
How can I graph the Lines of Code history for git repo?
Switch branch names in git
Migrating to GIT
How can I set up an editor to work with Git on Windows?
How do you deal with configuration files in source control?
Undoing a git reset --hard HEAD~1
Version Control. Getting started...
Why is Git better than Subversion?
Distributed source control options