I&#39;d like to move the last several commits I&#39;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 

Move the most recent commit(s) to a new branch with Git

I have a Git repository with many branches, some of them already merged and some not. Since the number of branches is quite large, how can I determine which branches have not yet been merged? I would like to avoid having to do an &quot;octopus&quot; merge and re-merging branches that have already been merged.

Find unmerged Git branches?

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged?

Is it possible to merge only certain files, instead of whole changeset?

Mercurial: Merging one file between branches in one repo

How do I compare one branch with another? I want to compare a branch with the latest revision in trunk.

SVN branch compare

Is it possible, to `merge` a branch and automatically `delete` it with a single command? The delete step should only be executed if merging was successful.


Merge and delete branch in one step/command

I have one remote repository with many branches. For example, my repository name is:

    http://navis.com/MyRepo.git

Its branches are:

    development
    production (master)
    testing

I would like to merge the `development` branch into the `production` (master) branch. Can anybody share a Git command for merging two remote branches?

Merge two remote branches in a Git repository

I&#39;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 reinsert my one line change after bringing it over into my branch.

So what&#39;s the easiest way in Git to do this?







How do I copy a version of a single file from one Git branch to another?

I&#39;ve got two branches from my master:

 - **v2.1**: (version 2) I&#39;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&#39;s commits from wss to v2.1?



How to copy commits from one branch to another?

How do you [branch and merge][1] with Apache Subversion using the TortoiseSVN client? 

  [1]: http://svnbook.red-bean.com/en/1.8/svn.branchmerge.html

How do you branch and merge with TortoiseSVN?

I checked a load of files in to a branch and merged and then had to remove them and now I&#39;m left with a large .pack file that I don&#39;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&#39;m not sure how much difference it makes but it shows a padlock against the file.

Thanks

---

EDIT

Here are some excerpts from my bash_history that should give an idea how I managed to get into this state (assume at this point I&#39;m working on a git branch called &#39;my-branch&#39; and I&#39;ve got a folder containing more folders/files):

    git add .
    git commit -m &quot;Adding my branch changes to master&quot;
    git checkout master
    git merge my-branch
    git rm -rf unwanted_folder/
    rm -rf unwanted_folder/     (not sure why I ran this as well but I did)

I thought I also ran the following but it doesn&#39;t appear in the bash_history with the others :

    git rm -rf --cached unwanted_folder/

I also thought I ran some git commands (like `git gc`) to try to tidy up the pack file but they don&#39;t appear in the .bash_history file either.

Remove large .pack file created by git

I&#39;m the only one in my organization who&#39;s making commits with the following message:

&gt; Merge remote-tracking branch &#39;origin/develop&#39; into develop 

Not sure what I&#39;m doing to cause them, but I&#39;d like to stop.

What command am I issuing to create this commit, and what is the proper command I ought to be using to not produce it?


Why am I merging &quot;remote-tracking branch &#39;origin/develop&#39; into develop&quot;?

I&#39;m trying to cherry-pick a commit from master and get it into the current production branch.  However, when I execute `git cherry-pick &lt;SHA-hash&gt;`, I just get this message:


    # On branch prod_20110801
    # Untracked files:
    #   (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)
    #	site/test-result/
     nothing added to commit but untracked files present (use &quot;git add&quot; 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 &#39;git reset&#39;

Note: I&#39;ve tried doing a reset and a reset --hard HEAD^, and neither seemed to change anything.

I&#39;m confused as to why this isn&#39;t working for me.

Any insight, advice, or ideas on how to resolve this would be helpful~!

git cherry-pick not working

What are the best practices and rules-of-thumb to follow while maintaining code?  Is it good practice to have only the production ready code in the development branch, or should untested latest code be available in the development branch?

How do you guys maintain your development code and production code?

Edit - Supplementary question - Does your development team follow &quot;commit-as-soon-as-possible-and-often-even-if-the-code-contains-minor-bugs-or-is-incomplete&quot; protocol or &quot;commit-ONLY-perfect-code&quot; protocol while committing code to DEVELOPMENT branch? 

How do you maintain development code and production code?

How do I create a branch?

After merging a branch, do you delete it from the repository?  
Is it a good practice or not?  

I usually create a lot of branches, since I don&#39;t want to break my current release, and I&#39;d wish to delete them to keep things in order.  
However, if you work with Assembla or GitHub, your merge requests from old branches will be saved on the site, so if you delete them you&#39;ll get an error since it won&#39;t be able to fetch them...

Usually how do manage that?

Should I delete a branch after merging it?

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&#39;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 master
    git push origin test
    git checkout master
    git pull origin test 

**B:** 
 
    git checkout test
    git pull origin master
    git checkout master
    git merge test

I am not using `--rebase` because from my understanding, rebase will get the changes from `master` and stack mine on top of that hence it could overwrite changes other people made.

**Question 2:** Which one of these two methods is right?  What is the difference there?

The goal in all of this is to keep my `test` branch updated with the things happening in `master` and later I could merge them back into `master` hoping to keep the timeline as linear as possible.

What is the best (and safest) way to merge a Git branch into master?

So, we have our main dev line, I create a branch, and developer b creates a branch.  We both do some work.  developer b finishes his work, merges back into the main dev line.  I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main.

How do I do that?

TFS: Updating branch with changes from main

I created a branch of an SVN project called &#39;features&#39;, and now whenever I try to update said project, it brings with it a features folder, which contains another copy of the project from the branch.

Is there a way to remove the branch from the repository completely so that this doesn&#39;t happen any more?


Deleting an SVN branch

I&#39;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&#39;s already been pushed.

I&#39;ve also tried `git merge` with various strategies but none of them undo the local changes, i.e. if I&#39;d added a file, a merge might bring other files back in line, but I&#39;ll still have that file that the upstream doesn&#39;t have.

I could just create a new branch off the upstream, but i&#39;d really like a merge that in terms of revision history applies all the changes to take my branch and make it identical to the upstream again, so that I can safely push that change without clobbering history. Is there such a command or series of commands?

git command for making one branch like another

After pushing I&#39;ve been seeing this message at remote repository:

&gt; 1 commit behind master. 
&gt;
&gt;  This merge has conflicts that must be resolved before it can be committed. 
&gt;
&gt; To manually merge these changes into TA20footerLast run the following commands:
&gt;
&gt; `git checkout 7c891f50c557`
&gt;
&gt; **Note**: This will create a detached head!
&gt;
&gt; `git merge remotes/origin/master`

What I can do to resolve &quot;1 commit behind master&quot;?

EGit strikes again. I made the mistake of trying to switch to a different branch in EGit and it somehow messed up and checked out no branch. I then made a commit to this non-branch, and then when I realized I wasn&#39;t tracking the right branch, I ran the following:

    $ git checkout issue2
    Warning: you are leaving 1 commit behind, not connected to any of your branches:

        bada553d My commit message

    If you want to keep them by creating a new branch, this may be a good time to do so with:

        git branch new_branch_name ....

    Branch issue2 set up to track remote branch issue2 from origin.
    Switched to a new branch issue2. 

Now that I&#39;ve botched things, how do I associate that commit with my current branch? I&#39;m not interested in creating a brand new branch, I just want to pull that commit into my branch, `issue2`. 

Warning: you are leaving 1 commit behind, not connected to any of your branches

I just encountered a problem when merging a branch into master in git. First, I got the branch name by running `git ls-remote`. Let&#39;s call that branch &quot;branch-name&quot;. I then ran `git merge branch-name` command and got the following result:

    fatal: branch-name - not something we can merge

How do I resolve this error?

How to resolve git&#39;s &quot;not something we can merge&quot; error

In tortoiseSvn 1.8 there is no &quot;reintegrate&quot; a branch option.
What is the right way to reintegrate a branch in Tortoise Svn 1.8?

In choose merge and then next option:
![Merge first step][1]


Then I get next window:
![enter image description here][2]

Or am I doing something else wrong?

  [1]: http://i.stack.imgur.com/WZKG5.png
  [2]: http://i.stack.imgur.com/siSr8.png

Tortoisesvn Subversion 1.8 - merge - no more reintegrate a branch option

I&#39;m a team leader in our web development company, and I&#39;d like to implement Git workflow in our team. Reading documentation and articles I&#39;ve found the following structure good for us:

We have a repository in a Bitbucket. **Master** branch is considered to contain stable code only. Every dev must create his own branch and implement features/bugfixes in his **own** branch. Once he decides, that his code is ready, he creates a nice branch history (using rebase, amend, cherry-pick etc.) and pushes it to Bitbucket, where creates a pull request to master branch. QA verifies functionality and approves (or disapproves) it, then I&#39;m verifying code and if it is ok, I merge his work into master (by fast-forward or rebasing for better commits history).

But this scheme is good only in a case, when single developer works on a branch. In our case we almost always have two developers for one branch, since one developer is working on *server-side* (PHP), and another - *client-side* (HTML/CSS/JS). How these two should collaborate in a way, that commit history in master stays clean?

Server dev creates basic structure of HTML files and client dev needs to get this structure. Logically would be for server dev to create a branch, and for client dev to create his own branch, based on server dev branch. But this means, that server dev needs to *publish* his branch in Bitbucket, which will make it *impossible for him to rebase or change commits*, that are already published.

Another option is to wait, until server dev finishes his work, publishes branch with nice commits history and forgets about it, and only after that client dev starts to work in this branch, but this will cause time delays, which is even worse.

How do you handle such a collaboration in your workflows?


All Branching and-Merging Solutions on Gang of Coders

Total of 24 Branching and-Merging Solutions