Tag: git merge

merge master into subtree branches

I have a large Git project which I would like to dissect into subprojects with their own repositories. Git’s subtrees are ideal for this task: You first create a branch with the contents of only one subfolder git subtree split -P <name-of-folder> -b <name-of-new-branch> and then pull this branch into another repository. For a transitional […]

Git workflow: How to merge commits made only on new branch

We are using git to track development and versioned releases and ran into some issues merging branches. Here is our workflow: production/1.0.0 A–B stage/2.0.0 A–B–C–D development E–F–G–J–L \ feature H–I–K Feature development happens on a feature branch that was created from development and when ready is merged back for demo and testing. This all works […]

Git overwrites files during a merge – does not show conflicts

Possible Duplicate: Git – how to force merge conflict and manual merge on selected file We’re trying to do a merge between two branches: stable code, and new features. The merge functionality is not working for us: it sometimes shows conflicts, but often just overwrites files without telling us of any conflict, probably with what […]

Merge conflicts with project.pbxproj on Git – Xcode iOS

Although I already read similar comments here, in this forum, I haven’t found an approach that may be suitable for teamwork in a seamless way. If you know what I mean, you already may found tricky working with git and the project.pbxproj file in Xcode, even when you are working in a different file. Say, […]

git merge says Already up-to-date but there's a committed difference in the branches

I have two branches: master and develop. When the changes from develop are finalized they are merged into master. At this point, the branches should be synchronized. However, I noticed that one file is missing from master but is on the develop branch. (It looks like it was deleted somehow but I cannot find any […]

missing files after git merge

Some weeks ago I create a feature branch, I’m developing in. There are severals commits and some new files as well. I can change from master branch to my development branch and versa vice and everything is fine. Today I tried to merge my branch back to the master branch. Therefore I changed to master […]

Git (windows); P4merge as mergetool error

I’ve tried setting up p4merge as my mergetool, but I can’t seem to get it working. Here’s my commands: git config –global merge.tool p4merge git config –global mergetool.p4merge.path “C:/Program Files/Perforce/p4merge.exe” git config –global mergetool.p4merge.cmd “p4merge.exe \”$BASE\” \”$LOCAL\” \”$REMOTE\” \”$MERGED\”” And here’s the error I’m getting: I’ve also tried installing a portable version of git and […]

Why does git sometimes mark added lines as changed lines (i.e. an empty conflict over an added piece of code)

I still don’t have a confirmed way to reproduce this but in case this is some well known issue, I’ll ask it anyway. What happens is that git often creates conflicts like this: <<<<<<< HEAD } // action_do_add ======= } // action_do_add …lots of code here… >>>>>>> some_branch So instead of noticing that I simply […]

Git: pre-receive hook to allow only merges and not direct commits into master

I have a problem creating a pre-receive hook on a git remote branch, doing what I want. What’s the problem? Direct commits to the master branch should be not allowed. Only merges into the master branch should be allowed. Solution My solution until now is to check, if there are changes in the push from […]

How many types of branches exist in git?

Struggling to understand how to work with remote branches and how many types of git branches there are I somehow got lost in differing namings and git versions. Here’s a few things that happened to me, while believing there are only TWO types of git branches: I unwillingly created a non-tracking local branch (so push […]

Git Baby is a git and github fan, let's start git clone.