branching-and-merging

问题 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

问题 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? 回答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

问题 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

问题 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? 回答1: Run this from the branch where you want the file to end up: git checkout otherbranch myfile.txt General

问题 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

问题 I\'m trying to take a branch with changes and bring it back to be identical to the upstream it diverged from. The changes are both local and have been pushed to github, so neither git reset or git rebase are really viable, since they change history, which is a bad thing with a branch that\'s already been pushed. I\'ve also tried git merge with various strategies but none of them undo the local changes, i.e. if I\'d added a file, a merge might bring other files back in line, but I\'ll still

问题 I\'d like to move the last several commits I\'ve committed to master to a new branch and take master back to before those commits were made. Unfortunately, my Git-fu is not strong enough yet, any help? I.e. How can I go from this master A - B - C - D - E to this? newbranch C - D - E / master A - B 回答1: Moving to an existing branch If you want to move your commits to an existing branch , it will look like this: git checkout existingbranch git merge master # Bring the commits here git checkout