You need to make sure that `git status` shows that no unstaged changes exist in your local repository.  
You can do this by first stashing your local changes and than pulling that branch. Afterward you can apply your stash.

---

If you want to re-create the branch structure of the fork in your local repository, you can do the following:

    git remote add fork &lt;url of fork&gt;
    git fetch fork &lt;branch&gt;
    git checkout -b fork_branch fork/&lt;branch&gt;

This will create the local branch `fork_branch` with the same history like `&lt;branch&gt;` in the fork, i.e. `fork_branch` will branch off of your `master` where `&lt;branch&gt;` does in the fork.
Additionally, your local branch will now track that branch in the fork, so you can easily pull in new changes committed in the fork.

I think you still need to make sure beforehand that your working copy doesn&#39;t contain any changes.

If you do not need to track the fork:

    git remote remove fork

Method without adding remote.

    git checkout --orphan fork_branch
    git reset --hard
    git pull &lt;url of fork&gt; &lt;branch&gt;

I was able to do something similar using...

```bash
git switch -c new_branch
git pull https://github.com/&lt;user&gt;/&lt;forked-repo&gt;.git &lt;branch&gt;
```

I need a Windows command to delete a directory and all its containing files but I do not want to see any errors if the directory does not exist.


Delete a directory and its files using command line but don&#39;t throw error if it doesn&#39;t exist

[The Factory Girl introduction][1] delineates the difference between `FactoryGirl.build()` and `FactoryGirl.create()`:

    # Returns a User instance that&#39;s not saved
    user = FactoryGirl.build(:user)
    
    # Returns a saved User instance
    user = FactoryGirl.create(:user)


I still doesn&#39;t understand the practical differences between the two. Can someone give an example where you would want to use one and not the other? Thanks!


  [1]: https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md

What&#39;s the difference between the build and create methods in FactoryGirl?

I have a local git repository which is a clone of a repository on github. Someone has forked the repository and made changes in a new branch on a new repository. I want to move this new branch into my repository (locally to work on it first before merging with the master).

I tried creating a new branch and then pulling from the forked repository but it complains because the new branch is a copy of the master branch as well as the local file changes, so it says 

`error: Your local changes to the following files would be overwritten by merge`.

So how can I pull the branch in the other repository into a new branch on my local repository?

I hope that makes sense. If not, this is my repository: https://github.com/MatthewLM/cbitcoin

As you can see, someone has created a new repository with the branch &quot;linuxBuild&quot;: https://github.com/austonst/cbitcoin/tree/linuxBuild

I want that branch on my local repository for MatthewLM/cbitcoin.

How can I do this?

Git pulling a branch from another repository?

I have a local git repository which is a clone of a repository on github. Someone has forked the repository and made changes in a new branch on a new repository. I want to move this new branch into my repository (locally to work on it first before merging with the master).
I tried creating a new branch and then pulling from the forked repository but it complains because the new branch is a copy of the master branch as well as the local file changes, so it says
<code>error: Your local changes to the following files would be overwritten by merge</code>.
So how can I pull the branch in the other repository into a new branch on my local repository?
I hope that makes sense. If not, this is my repository: <a href="https://github.com/MatthewLM/cbitcoin" target="_blank" rel="noopener noreferrer">https://github.com/MatthewLM/cbitcoin</a>
As you can see, someone has created a new repository with the branch "linuxBuild": <a href="https://github.com/austonst/cbitcoin/tree/linuxBuild" target="_blank" rel="noopener noreferrer">https://github.com/austonst/cbitcoin/tree/linuxBuild</a>
I want that branch on my local repository for MatthewLM/cbitcoin.
How can I do this?

How do I replace a git submodule with a different git repo?

Specifically, I have a submodule:

 - located at `./ExternalFrameworks/TestFramework` that points to a git repo `git@github.com:userA/TestFramework.git` 
 - I&#39;d like it to now point to `git@github.com:userB/TestFramework.git`.

The problem is that when I delete the submodule with the method described [here][1], then re-add it using the command     

    git submodule add git@github.com:userB/TestFramework.git

I get this error:

    A git directory for &#39;ExternalFrameworks/TestFramework&#39; is found locally with remote(s):
      origin	git@github.com:userA/TestFramework.git
    If you want to reuse this local git directory instead of cloning again from
      git@github.com:userB/TestFramework.git
    use the &#39;--force&#39; option. If the local git directory is not the correct repo
    or you are unsure what this means choose another name with the &#39;--name&#39; option.


  [1]: https://stackoverflow.com/questions/1260748/how-do-i-remove-a-git-submodule

How do I replace a git submodule with another repo?

In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using `git add FILE` after some editing)

Now I&#39;d like to undo my conflict resolution attempt and start over resolving that file.

How can I do that?

Restart/undo conflict resolution in a single file

I&#39;m trying to rebase &#39;dev&#39; to catch up to &#39;master&#39; branch. 

    $ git checkout dev 
    $ git rebase master 
    First, rewinding head to replay your work on top of it...
    Applying: Corrected compilation problems that came from conversion from SVN.
    Using index info to reconstruct a base tree...
    M       src/com/....
    &lt;stdin&gt;:125: trailing whitespace.
    /**
    &lt;stdin&gt;:126: trailing whitespace.
     *
    &lt;stdin&gt;:127: trailing whitespace.
     */
    &lt;stdin&gt;:128: trailing whitespace.
    package com....
    &lt;stdin&gt;:129: trailing whitespace.
    
    warning: squelched 117 whitespace errors
    warning: 122 lines add whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging src/com/....
    CONFLICT (content): Merge conflict in src/com/...
    Failed to merge in the changes.
    Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.
    
    $ vi src/com/.....   { fixed the merge issue on one file } 
    $ git add -A . 
    $ git rebase --continue 
    src/com/....: needs merge
    You must edit all merge conflicts and then
    mark them as resolved using git add
    $ vi src/com....      { verified, no &gt;&gt;&gt; or &lt;&lt;&lt; left, no merge markers } 
    $ git rebase --continue 
    Applying: Corrected compilation problems that came from conversion from SVN.
    No changes - did you forget to use &#39;git add&#39;?
    If there is nothing left to stage, chances are that something else
    already introduced the same changes; you might want to skip this patch.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.

Any ideas?

Git rebase merge conflict cannot continue

# Background

Using Git 1.8.1.1 on Linux. The repository looks as follows:

    master
      book

The submodule was created as follows:

    $ cd /path/to/master
    $ git submodule add https://user@bitbucket.org/user/repo.git book

The `book` submodule is clean:

    $ cd /path/to/master/book/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Problem

The master, on the other hand, shows there are &quot;new commits&quot; for the book submodule:

    $ cd /path/to/master/
    $ git status
    # On branch master
    # Changes not staged for commit:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   book (new commits)
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

Git should ignore the submodule directory completely, so that the master is also clean:

    $ cd /path/to/master/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Failed Attempt #1 - dirty

Inside the file `master/.gitmodules` is the following, as per this [answer][1]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = dirty

# Failed Attempt #2 - untracked

Changed `master/.gitmodules` to the following, as per this [answer][2]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = untracked

# Failed Attempt #3 - showUntrackedFiles

Edited `master/.git/config` to the following, as per this [answer][3]:

    [status]
       showUntrackedFiles = no

# Failed Attempt #4 - ignore

Added the book directory to the master ignore file:

    $ cd /path/to/master/
    $ echo book &gt; .gitignore

# Failed Attempt #5 - clone

Added the book directory to the master as follows:

    $ cd /path/to/master/
    $ rm -rf book
    $ git clone https://user@bitbucket.org/user/repo.git book

# Question

How can the `book` submodule be in its own repository directory under the `master` repository yet have git ignore the `book` submodule? That is, the following should not display:

    #
    #       modified:   book (new commits)
    #

How to suppress that message when executing `git status` in the master repository?

An article about [git submodule pitfalls][4] suggests this an inappropriate submodule usage?


  [1]: https://stackoverflow.com/a/5542452/59087
  [2]: https://stackoverflow.com/a/5127213/59087
  [3]: https://stackoverflow.com/a/4345788/59087
  [4]: http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/


Ignore new commits for git submodule

I can not commit a change:

    $ git commit
    error: invalid object 100644 13da9eeff5a9150cf2135aaed4d2e337f97b8114 for &#39;spec/routing/splits_routing_spec.rb&#39;
    error: Error building trees

I tried so far:

    $ git fsck | grep 13da
    missing blob 13da9eeff5a9150cf2135aaed4d2e337f97b8114

and also:

    $ git prune
    error: Could not read 1394dce6fd1ad15a70b2f2623509082007dc5b6c
    fatal: bad tree object 1394dce6fd1ad15a70b2f2623509082007dc5b6c

and also:

    $ git fsck | grep 13da
    missing blob 13da9eeff5a9150cf2135aaed4d2e337f97b8114

but nothing helped. Should I delete the file, commit and reintroduce back? I am willing to lose little bit of history if it brings git commit back.

git commit stopped working - Error building trees

Recently I joined **GitHub**. I hosted some projects there.

I need to include some images in my README File. I don&#39;t know how to do that.

I searched about this, but all I got was some links which tell me to &quot;host images on web and specify the image path in README.md file&quot;.

Is there any way to do this without hosting the images on any third-party web hosting services?

How to add images to README.md on GitHub?

I need to generate a diff for a single file that will show the differences between two versions, which are actually tags in github. I then want to send this diff to someone via email so a github URL for the diff would be ideal. The github compare view will allow me to do this for all changed files, but that&#39;s no good as there are thousands of files in my repo.

I can do this in the command line as follows, but this doesn&#39;t help as I need to send the diff to someone via email:

    git diff tag1 tag2 -- path/to/file

I found the command line version discussed here:
https://stackoverflow.com/questions/10611112/how-can-i-see-the-differences-in-a-designated-file-between-a-local-branch-and-a

How can I generate a diff for a single file between two branches in github

There is a wonderful contributions chart that github.com came with.

![enter image description here][1]

Does anybody know if they use some kind of library or gem? 

If it is open source, I would like to use it my project as well. It looks great!



  [1]: http://i.stack.imgur.com/43Wc0.png

Github contributions graph

I made a pull request on GitHub. Now the owner of the repository is saying to squash all the commits into one.

When I type `git rebase -i` Notepad opens with the following content:

    noop

    # Rebase 0b13622..0b13622 onto 0b13622
    #
    # Commands:
    #  p, pick = use commit
    #  r, reword = use commit, but edit the commit message
    #  e, edit = use commit, but stop for amending
    #  s, squash = use commit, but meld into previous commit
    #  f, fixup = like &quot;squash&quot;, but discard this commit&#39;s log message
    #  x, exec = run command (the rest of the line) using shell
    #
    # These lines can be re-ordered; they are executed from top to bottom.
    #
    # If you remove a line here THAT COMMIT WILL BE LOST.
    #
    # However, if you remove everything, the rebase will be aborted.
    #
    # Note that empty commits are commented out

I searched on Google but I do not understand how to do this.

Squash all my commits into one for GitHub pull request

I recently updated my local Git installation to `1.8.1` from `1.8.0.1`.  

I&#39;m noticing that, when I work on GitHub, it doesn&#39;t prompt me for username and password on push anymore.  

This troubles me, as I see having to type user and password every time as a good security measure. (what if someone else uses my computer?)  

I checked the following:  

* `1.8.0.1` on another computer still asks for username and password.
* my account on github still enforces private/security controls.
* I am using https remote references, rather than ssh.
* For good measure, I checked in my `~/.ssh` fonder. Nothing wrong there.
* I&#39;m __not__ storing the login details in `~/.gitconfig` or individual `&lt;proj&gt;/.git/config` files.
* I&#39;m also __not__ storing anything github-related in `~/.netrc`.
* I created a new dummy archive: still doesn&#39;t prompt me for login.

I couldn&#39;t find anything in the git [release notes archive](https://github.com/git/git/tree/master/Documentation/RelNotes).  

Does anyone know if this is a new git behaviour? How do I restore the prompt?  


How can I force user and password prompt when pushing to my git repository?

I have a master branch and a working `branch_1`. I want to &#39;move&#39; `branch_1` exactly as it is to `master`. So I want something like this:

    git checkout master
    git merge branch_1 # I don&#39;t know what is correct...


Things which I did but I got loads of files messed up with annoying conflicts. So now master contains exactly the same files of `branch_1` avoiding any conflicts, just overwriting files.
Any help?

Git merge branch into master

I&#39;m thinking if there is a way that when I merge a branch into another branch that ALL changed files are listed in my commit message and not just the ones which were modified in both branches.
This would give me a better overview of what was changed in the branch just by seeing the merge commit.
Is there a way to do this?

List all modified files in git merge commit - even the fast forwarded

I&#39;ve created lots of branches in one of our repositories. Those branches are for testing before it will be pulled to the master. Now I see lots of them on the list and they we will never use it again. How to delete those branches directly to Bitbucket?

Delete branches in Bitbucket

I would like to completely empty the master branch in Git. For now, I would also like to keep all other branches which have been branched from master.

Is this possible and how?

How can I completely empty the master branch in Git?

When I was browsing GitHub repositories I quite often saw &quot;wip&quot; branches (e.g. `3.1.0-wip`). What does &quot;wip&quot; mean?

I couldn&#39;t find the answer anywhere - neither on Google nor on GitHub:help.

Content Type	Original Author	Original Content on Stackoverflow
Question	Matthew Mitchell	View Question on Stackoverflow
Solution 1 - Git	Daniel Hilgarth	View Answer on Stackoverflow
Solution 2 - Git	Alex78191	View Answer on Stackoverflow
Solution 3 - Git	Integralist	View Answer on Stackoverflow

Git pulling a branch from another repository?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

What's the difference between the build and create methods in FactoryGirl?

Delete a directory and its files using command line but don't throw error if it doesn't exist

Attributions