git-merge

I have not done so much with git so far. Now, I have the following problem. While I did some local modifications and commits, my colleague restructured files and folders within a new branch. Then, I added a remote tracking branch (reflecting his changes) and tried to merge my modifications into it. Of course it fails as the files moved to another location. How can I go onwards? A 'git status' shows me this: # On branch develop # You have unmerged paths. # (fix conflicts and run "git commit") # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # deleted by us:

Is there a way of automatically adding all the commit comments from the squashed mybranch commits when doing a git merge --squash mybranch so that the single commit contains a concatenation of all the commit comments from mybranch I think that's what "git merge --squash" does automatically! Just do the commit with "git commit --no-edit" and I think that's what you'll get. I see all the commit messages inside .git/SQUASH_MSG immediately after I run the "git merge --squash" command. Do you? Personally, I squash into master, but then force-push the result back to my topic branch. This way my

I have a local branch ( CRM-ayrshireminis ) that has a couple of commits on it that I have pushed to the origin ( origin/CRM-ayrshireminis ). This branch was created from the develop branch about one week ago, on which there have been one weeks worth of work from other collaborators. What I want to do is rebase the latest code from origin/develop into my feature branch CRM-ayrshireminis . What I done was: git checkout develop git pull git rebase -i develop CRM-ayrshireminis I had two commits, so I squashed them into one and then quit out. I got the message saying Rebasing (2/2) , so it seemed

Why can’t I merge into a bare repo? Bare repos don’t have a HEAD or a working tree. In the config file we can see bare=true . You also can’t pull in a bare repo (because pull = fetch & merge and merge doesn't work). However, you can push to a bare repo – why? As far as I know, push also contains a merge, but in this case we can do it well. So, the question could be “how does git merge work?”. Why does it need a HEAD ? What is it doing when merging? As Chronial points out , pushing does fast-forward merges or forced updates, which just moves references/branch pointers to a different commit. In

I'm working with a repository where a merge was performed weeks ago which we just discovered used the --strategy=ours flag (it was supposed to use the --strategy-option=ours flag), thus not applying any changes to HEAD. However, we need to have the changes applied. Git already recognizes the branch as being merged and the commits in the history of the branch. This sort of merge can't be reverted using git revert -m ... What would be the proper way of reverting and/or re-applying the merge to change the files? master A - B - E - F - G ---> L - M - N \ / topic C - D Merge commit (F) would be the