branching-and-merging

I'm trying to cherry-pick a commit from master and get it into the current production branch. However, when I execute git cherry-pick <SHA-hash> , I just get this message: # On branch prod_20110801 # Untracked files: # (use "git add <file>..." to include in what will be committed) # site/test-result/ nothing added to commit but untracked files present (use "git add" to track) The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git reset' Note: I've tried doing a reset and a reset -

I checked a load of files in to a branch and merged and then had to remove them and now I'm left with a large .pack file that I don't know how to get rid of. I deleted all the files using git rm -rf xxxxxx and I also ran the --cached option as well. Can someone tell me how I can remove a large .pack file that is currently in the following directory: .git/objects/pack/pack-xxxxxxxxxxxxxxxxx.pack Do I just need to remove the branch that I still have but am no longer using? Or is there something else I need to run? I'm not sure how much difference it makes but it shows a padlock against the file.

I've got two branches from my master: v2.1 : (version 2) I've been working on for several months wss : that I created yesterday to add one specific feature to my master (in production) Is there a way to copy yesterday's commits from wss to v2.1? You should really have a workflow that lets you do this all by merging: - x - x - x (v2) - x - x - x (v2.1) \ x - x - x (wss) So all you have to do is git checkout v2.1 and git merge wss . If for some reason you really can't do this, and you can't use git rebase to move your wss branch to the right place, the command to grab a single commit from

A new branch from master is created, we call it test . There are several developers who either commit to master or create other branches and later merge into master . Let's say work on test is taking several days and you want to continuously keep test updated with commits inside master . I would do git pull origin master from test . Question 1: Is this the right approach? Other developers could have easily worked on same files as I have worked btw. My work on test is done and I am ready to merge it back to master . Here are the two ways I can think of: A: git checkout test git pull origin

I've got two branches that are fully merged together. However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then re-insert my one line change after bringing it over into my branch. So what's the easiest way in git to do this? madlep Run this from the branch where you want the file to end up: git checkout otherbranch myfile.txt General formulas: git checkout <commit_hash> <relative_path_to_file_or_dir> git checkout <remote_name>/<branch

We have decided to follow the process of creating a new SVN branch for every new feature that we add to our mobile app. The ultimate goal behind this is to preserve the history for every single code change (this doesn't happen when we manually copy project folders into SVN instead of creating & merging branches). My problem is that so far I am unable to merge changes from one branch to another. I have already referred the following posts without success: How to merge branch with trunk using SVN in android studio . Android Studio Update Project: Merge vs Rebase vs Branch Default . How to merge