The same issue i have faced, i will delete the local branch in my machine and recreate it from origin each and every time. But finally i got the solution. I ran the below command
 
`git am --abort` solved my problem.

The only thing that I could do to cancel out the rebase after getting this error message was to delete the .git\rebase-apply folder and all of its contents.

    rm .\.git\rebase-apply

I encountered this in SourceTree, where branches had different .gitignore files.  I resolved it by committing a matching ```.gitignore``` prior to the merge.

I got this error error when trying to `git pull –rebase origin master`.

The accepted `git am --abort` didn&#39;t help, unfortunately, saying: 

&gt; error: You seem to have moved HEAD since the last &#39;am&#39; failure.
&gt;
&gt; Not rewinding to ORIG_HEAD

But the good old pull did work (and the rebase started working after it, too):

    git pull origin master

I am having issues getting my directive to render its content only after my promise has been resolved. I thought `then()` was supposed to do this but it doesn&#39;t seem to be working..

Here is my controller:

    // Generated by CoffeeScript 1.6.3
    (function() {
      var sprangularControllers;

      sprangularControllers = angular.module(&#39;sprangularControllers&#39;, [&#39;sprangularServices&#39;, &#39;ngRoute&#39;]);

      sprangularControllers.controller(&#39;productsController&#39;, [
        &#39;$scope&#39;, &#39;$route&#39;, &#39;$routeParams&#39;, &#39;Product&#39;, &#39;Taxonomy&#39;, function($scope, $route, $routeParams, Product, Taxonomy) {
          Taxonomy.taxonomies_with_meta().$promise.then(function(response) {
            return $scope.taxonomies = response.taxonomies;
          });
          return Product.find($routeParams.id).$promise.then(function(response) {
            return $scope.currentProduct = response;
          });
        }
      ]);

    }).call(this);

My directive: 

    // Generated by CoffeeScript 1.6.3
    (function() {
      var sprangularDirectives;

      sprangularDirectives = angular.module(&#39;sprangularDirectives&#39;, []);

      sprangularDirectives.directive(&#39;productDirective&#39;, function() {
        return {
          scope: {
            product: &#39;=&#39;
          },
          templateUrl: &#39;partials/product/_product.html&#39;,
          link: function(scope, el, attrs) {
            console.log(scope);
            console.log(scope.product);
            return el.text(scope.product.name);
          }
        };
      });

    }).call(this);

Scope returns okay, and when I check it in dev tools `scope.product` is not undefined however I am presuming that is because by the time I check it the promise has been resolved?

`console.log(scope.product)` however, returns undefined..



Directive is being rendered before promise is resolved

I am setting up bearer token authentication in Web API 2, and I don&#39;t understand how (or where) the bearer token is being stored server-side. Here is the relevant code:

**Startup:**

    public partial class Startup
    {
        public static OAuthAuthorizationServerOptions OAuthOptions { get; private set; }
        public static Func&lt;UserManager&lt;IdentityUser&gt;&gt; UserManagerFactory { get; set; }
        public static string PublicClientId { get; private set; }

        static Startup()
        {
            PublicClientId = &quot;self&quot;;
            UserManagerFactory = () =&gt; new UserManager&lt;IdentityUser&gt;(new UserStore&lt;IdentityUser&gt;());
            OAuthOptions = new OAuthAuthorizationServerOptions
            {
                TokenEndpointPath = new PathString(&quot;/Token&quot;),
                Provider = new ApplicationOAuthProvider(PublicClientId, UserManagerFactory),
                AuthorizeEndpointPath = new PathString(&quot;/api/Account/ExternalLogin&quot;),
                AccessTokenExpireTimeSpan = TimeSpan.FromDays(14),
                AllowInsecureHttp = true
            };
        }

        public void ConfigureAuth(IAppBuilder app)
        {
            // Enable the application to use a cookie to store information for the signed in user
            app.UseCookieAuthentication(new CookieAuthenticationOptions());

            // Use a cookie to temporarily store information about a user logging in with a third party login provider
            app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);

            app.UseOAuthBearerTokens(OAuthOptions);
        }
    }


**WebApiConfig:**

    public class WebApiConfig
    {
        public static void ConfigureWebApi()
        {
            Register(GlobalConfiguration.Configuration);
        }

        public static void Register(HttpConfiguration http)
        {
            AuthUtil.ConfigureWebApiToUseOnlyBearerTokenAuthentication(http);
            http.Routes.MapHttpRoute(&quot;ActionApi&quot;, &quot;api/{controller}/{action}&quot;, new {action = Actions.Default});
        }
    }


**AuthUtil:**

    public class AuthUtil
    {
        public static string Token(string email)
        {
            var identity = new ClaimsIdentity(Startup.OAuthOptions.AuthenticationType);
            identity.AddClaim(new Claim(ClaimTypes.Name, email));
            var ticket = new AuthenticationTicket(identity, new AuthenticationProperties());
            var currentUtc = new SystemClock().UtcNow;
            ticket.Properties.IssuedUtc = currentUtc;
            ticket.Properties.ExpiresUtc = currentUtc.Add(TimeSpan.FromMinutes(30));
            var token = Startup.OAuthOptions.AccessTokenFormat.Protect(ticket);
            return token;
        }

        public static void ConfigureWebApiToUseOnlyBearerTokenAuthentication(HttpConfiguration http)
        {
            http.SuppressDefaultHostAuthentication();
            http.Filters.Add(new HostAuthenticationFilter(OAuthDefaults.AuthenticationType));
        }
    }

**LoginController:**

    public class LoginController : ApiController
    {
        ...
        
        public HttpResponseMessage Post([FromBody] LoginJson loginJson)
        {
            HttpResponseMessage loginResponse;
            if (/* is valid login */)
            {
                var accessToken = AuthUtil.Token(loginJson.email);
                loginResponse = /* HTTP response including accessToken */;
            }
            else
            {
                loginResponse = /* HTTP response with error */;
            }
            return loginResponse;
        }
    }

Using the above code, I&#39;m able to login and store the bearer token client-side in a cookie, and then make calls to controllers marked with [Authorize] and it lets me in.

**My questions are:**

1. Where / how is the bearer token being stored server-side? It seems like this is hapenning through one of the OWIN calls but I can&#39;t tell where.

2. Is it possible to persist the bearer tokens to a database server-side so that they can remain in place after a Web API server restart?

3. If the answer to #2 is no, is there anyway for a client to maintain its bearer token and re-use it even after the Web API goes down and comes back up? While this may be rare in Production, it can happen quite often doing local testing.

How are bearer tokens stored server-side in Web API 2?

I will try to explain the problem that I have. I have used the `rebase` option via git bash many times. Now I have SmartGit and don’t know why `rebase` is not correct.

**Step 1:**

![](http://i.imgur.com/jDe8HBS.jpg?1)

**Step 2:**

![](http://i.imgur.com/Cm7bC9N.jpg?1)

**Step 3:**

![](http://i.imgur.com/YBbVSsW.jpg?1)

The result is that `HEAD` detaches.

Rebasing in smartgit &quot;git-am is in progress&quot;

I will try to explain the problem that I have. I have used the <code>rebase</code> option via git bash many times. Now I have SmartGit and don’t know why <code>rebase</code> is not correct.
Step 1:
<img src="http://i.imgur.com/jDe8HBS.jpg?1" alt="">
Step 2:
<img src="http://i.imgur.com/Cm7bC9N.jpg?1" alt="">
Step 3:
<img src="http://i.imgur.com/YBbVSsW.jpg?1" alt="">
The result is that <code>HEAD</code> detaches.

I know that you can disable git integration by using the Tools / Options dialog, but what I&#39;ve noticed is that this setting doesn&#39;t seem to persist across sessions; i.e., as soon as close and reopen the solution, Git integration is enabled again. I&#39;m guessing Visual Studio is seeing the .git folder in my solution file system tree.

There are a variety of Visual Studio 2013 plugins that behave incorrectly when the Git plug-in is enabled, I prefer to manage my source control at the command line, and I work on a few very large projects for which the Git integration introduces noticeable slowdowns in opening and working with the solution. I&#39;d like to turn it off for good, as I simply don&#39;t use it or need it. Is this possible?

How can you disable Git integration in Visual Studio 2013 permanently?

What is the meaning in behind the `fsck` command name?

The [documentation][1] of the command does not seem to mention what the name stands for.


  [1]: http://git-scm.com/docs/git-fsck

What does git fsck stand for?

I have created two GitHub accounts.  One for my work user and one for my personal self.  I needed to do catch up on some work and as such cloned my work repo onto my personal PC.  In order to do simple &quot;git push origin master&quot; commits without entering my username and password the whole time I simply want to add my public key from my home pc to the work repo.  However Github gives this error:

    Error: Key already use

After a bit of Googling I came across this [link][1] which states &quot;To resolve the issue, remove the key from the other account or repository and add it to your account&quot;  Of course there is a duplicate key as I&#39;ve added my home public key to github so that I can code on my own personal projects. After all I want to be able to code to my work repo using both my work pc and personal pc.

How can you add multiple &quot;same&quot; public keys without Github throwing that error and also why in the world, is that error thrown in the first place?


  [1]: https://help.github.com/articles/error-key-already-in-use

GitHub Error: Key already in use

**How do I discard all git commits that haven&#39;t been pushed and then force git to not commit anything in the data/ directory?**

I&#39;m trying to force overwrite all changes to a project stored on github from my c9.io project.  I accidentally git added some mongodb data files.  I tried to add the data/ directory to .gitignore. I pulled from github to get the updated .gitignore, however when I try and git push, these stubborn files in data/ are still staged for commit.  I also tried git reset, git rebase, git clean and [this](http://www.thisprogrammingthing.com/2013/fixing-the-this-exceeds-githubs-file-size-limit-of-100-mb-error/) where I changed dmpfile.sql to pi/data/node-login.1.

Please help I&#39;ve been at this for hours and I&#39;m really frustrated

    Counting objects: 15, done.
    Delta compression using up to 2 threads.
    Compressing objects: 100% (13/13), done.
    Writing objects: 100% (13/13), 150.22 KiB | 92 KiB/s, done.
    Total 13 (delta 6), reused 0 (delta 0)
    remote: warning: File pi/data/local.0 is 64.00 MB; this is larger than GitHub&#39;s recommended maximum file size of 50 MB
    remote: warning: File pi/data/node-login.0 is 64.00 MB; this is larger than GitHub&#39;s recommended maximum file size of 50 MB
    remote: error: GH001: Large files detected.
    remote: error: Trace: e6ade98208c08b634ed28aefea36dfbb
    remote: error: See http://git.io/iEPt8g for more information.
    remote: error: File pi/data/node-login.1 is 128.00 MB; this exceeds GitHub&#39;s file size limit of 100 MB
    To git@github.com:bobbyg603/goddard.git
     ! [remote rejected] master -&gt; master (pre-receive hook declined)
    error: failed to push some refs to &#39;git@github.com:bobbyg603/goddard.git&#39;

.gitignore:

    lib-cov
    *.seed
    *.log
    *.csv
    *.dat
    *.out
    *.pid
    *.gz

    data/

    pids
    logs
    results

    npm-debug.log
    node_modules

    .project
    .settings

Thanks,
Bobby

Can&#39;t remove file from git commit

We have a fairly simple node.js app, but due to AWS Elastic Beanstalk deployment mechanism, it takes about 5 minutes to roll-out a new version (via `git aws.push`) even after a single file commit.

I.e. the commit itself (and upload) is fast (only 1 file to push), but then Elastic Beanstalk fetches whole package from S3, unzips it and runs `npm install`, which causes node-gyp to compile some modules. Upon installation/building completion, Elastic Beanstalk wipes `/var/app/current` and replaces it with the new app version.

Needless to say, constant node_modules rebuilding is not necessary, and rebuilding that takes 30 seconds on my old Macbook Air, takes &gt;5 mins on a ec2.micro instance, not fun.

I see two approaches here:

 1. tweak `/opt/containerfiles/ebnode.py` and play with node_modules location to avoid its removal and rebuilding upon deployment. 
 2. set up a git repo on Elastic Beanstalk EC2 instance and basically re-write deployment procedure ourselves, so /var/app/current receives pushes and runs `npm install` only when necessary (which makes Elastic Beanstalk to look like OpsWorks..)

Both options lack grace and are prone to issues when Amazon updates their Elastic Beanstalk hooks and architecture.

Maybe somebody has a better idea how to avoid constant rebuilding of node_modules that are already present in the app dir? Thank you.

avoid rebuilding node_modules in elastic beanstalk

I am getting this message:

     First, rewinding head to replay your work on top of it...

each time I do a `git pull --rebase origin &lt;branch&gt;`, however I would like to discard all my work that may be replayed on top of it.. Basically I would like to rebase only the origin branch without my work on top of it.
How can I clean those commits that comes up wrongly all times I try to pull rebase?
Again, my goal is just pull rebase the exact snapshot of the origin branch without my work on top of it.
Thanks in advance.




Git: First rewinding head to replay

I&#39;m using [SourceTree](http://www.sourcetreeapp.com/) as my git tool on Windows.

I have a *main* branch and a *feature* branch and I can&#39;t get SourceTree to perform a rebase when I have a conflict.

*main* looks like:
&gt;c1 -&gt; c2 -&gt; c4 -&gt; c5

*feature* looks like:
&gt;c1-&gt; c2 -&gt; c3

I want to rebase *feature* so it will be:
&gt;c1 -&gt; c2-&gt; c4-&gt; c5-&gt; c3

There is a conflict between *c3* and *c5*.  I can resolve the conflict, but when I commit the changes I get a *HEAD* tag and looking at my graph I can see that *feature* branch wasn&#39;t rebased.  

How can I get the rebase to work?




Using Source Tree, rebase with conflict, rebase doesn&#39;t work after conflict resovled

I&#39;m the administrator of the GitHub repository [https://github.com/plison/opendial][1]. I would like to reduce the number of commits on the repository, since the repository already has a few thousand commits, many of whom are minor debugging changes that could easily be squashed together (especially the ones that are a few years old).

I&#39;m therefore trying to apply rebasing in order to squash together part of my commits. However, I&#39;ve experience the following issue:

 1. When I type e.g. `git rebase -i HEAD~10`, I get a quite long number of commit lines (much more than 10) in the interactive editor. What could be the reason?
 2. More importantly, once I close the interactive editor to start the rebasing, I systematically get the error message &quot;error:could not apply &lt;some commit ID&gt;&#39;, **even when I do not make any change to the commits** (i.e. if I leave all lines as &#39;pick&#39;, without any modification or reordering).

How can I solve these issues? It should be noted that the repository was automatically imported from a previous (SVN) repository hosted on Google Code. The conversion seemed so far to have worked well, but I&#39;m wondering why I get these errors when trying to rebase my commits.

  [1]: https://github.com/plison/opendial

Error with git rebase (&quot;could not apply...&quot;)

So my history looks like this:

```
o---o---o---o  master
     \
      o---o---o  A
               \
                o B
```

So, to explain:

- I have branch `A` which was started from `master`
- I have branch `B` (with only 1 commit) which was started from `A`

What I want is this:

```
o---o---o---o  master
             \
              o---o---o  A
                       \
                        o B
```

---

What I did was:

1).

```
git checkout A
git rebase master
```

This resulted in a lot of conflicts which, after some significant time spent fixing, the following history emerged:

```
o---o---o---o  master
             \
              o---o---o  A
```

Which is exactly what I wanted.

(I don&#39;t know where `B` is right now)

---

2).

After this I did a lot of squashes and changed the order of commits on `A`, to make the history look like I want.

---

3).

Now, what I also want to do is:

```
git checkout B
git rebase A
```

However this doesn&#39;t seem to work and I don&#39;t know why. If I do `git log` I see the commits which were there before I did step 1.

Also, I get the same huge number of conflicts which I already solved at step 1. I spent significant time doing it, don&#39;t want to do it again.

[This example](https://stackoverflow.com/questions/27445747/how-to-rebase-over-already-rebased-branch) suggested to use `--onto`, which I did:

```
git checkout B
git rebase --onto A
```

But this deletes the commit on `B` entirely and makes `A` and `B` point to the same commit i.e. the last one on `A`.

---

My question is: **How can I effectively rebase B off A so that it looks like B started from A** ? (which was actually true in the beginning).

My best guess is that I&#39;m using `--onto` wrong. Or that I should use something else (like `cherry-pick`).

How to rebase a branch off a rebased branch?

During `git rebase origin/development` the following error message is shown from Git:

    fatal: refusing to merge unrelated histories
    Error redoing merge 1234deadbeef1234deadbeef

My Git version is 2.9.0. It used to work fine in the previous version. 

How can I continue this rebase allowing unrelated histories with the forced flag introduced in the new release?


Git refusing to merge unrelated histories on rebase

I did `git rebase master`, fixed the conflicts reported in a file, and then `git add` the file to resolve the conflict.  Then I did `git rebase --continue`, and got this:

&gt; Applying: Fixed unit test
&gt;
&gt; No changes - did you forget to use &#39;git
&gt; add&#39;? If there is nothing left to stage, chances are that something
&gt; else already introduced the same changes; you might want to skip this
&gt; patch.
&gt; 
&gt; When you have resolved this problem, run &quot;git rebase --continue&quot;. If
&gt; you prefer to skip this patch, run &quot;git rebase --skip&quot; instead. To
&gt; check out the original branch and stop rebasing, run &quot;git rebase
&gt; --abort&quot;.

Any idea what I am missing here? Should I do git rebase --skip?

git rebase --continue won&#39;t work

I used `git init` to create a fresh repo, then made three commits. Now I want to rebase to go back and amend my first commit, but if I do `git rebase -i HEAD~3` it complains! If I try the same with `HEAD~2` then it kinda works but only lets me rearrange the last two commits.

How do I refer to the &#39;commit before there were any commits&#39; or go back and insert an empty commit?

How do I git rebase the first commit?

Let&#39;s say `origin/master` has commit `A--B--C` and my `local/master` has commit `A--B--D`.


What will happen if I use `git pull --rebase` ?

What will happen if I use `git pull --ff-only` ?

Is there any difference in the resulting commit tree ?

Difference between git pull --rebase and git pull --ff-only

When I do an interactive rebase, e.g.

    git rebase -i HEAD~3

the rebase interactive editor (vim in my case) opens to let me edit the commits to rebase

    pick c843ea2 Set Vim column limit to 80 (OS X)
    pick fc32eac Add Bash alias for `pbcopy` (OS X)
    ....

If I now decide that I want to abort the rebase and quit vim using `:q` the rebase starts anyway. I&#39;m using git version `1.9.0.msysgit.0` on windows.

Sure I can just delete all `pick` lines, but it might be a lot to do if I rebase a longer history. Is there another way?

How can I quit the rebase interactive editor (vim) and abort the rebase?

How to abort a git rebase from inside vim during interactive editing

Suppose I am rebasing **experiment** branch on **master** and there are conflicts in files. And of course there are files deleted in both branches. So when I am resolving the conflicts, in `git status` I see `deleted by us` and `deleted by them`. Its very confusing. Is there any way of understanding what they mean? Who is **them** and who is **us**?

Or while rebasing is there another way to know which file was deleted by which branch? Like printing the branch name?

Content Type	Original Author	Original Content on Stackoverflow
Question	Ark	View Question on Stackoverflow
Solution 1 - Git	Madhan Ayyasamy	View Answer on Stackoverflow
Solution 2 - Git	Yaakov Ellis	View Answer on Stackoverflow
Solution 3 - Git	Mike Decker	View Answer on Stackoverflow
Solution 4 - Git	mehov	View Answer on Stackoverflow

Rebasing in smartgit "git-am is in progress"

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

How are bearer tokens stored server-side in Web API 2?

Directive is being rendered before promise is resolved

Attributions