I just faced the same issue and solved it using the following.First clear tracked files by using :

    git clean -d -f

then try `git pull origin master`

You can view other git clean options by typing `git clean -help`

To remove &amp; delete all changes `git clean -d -f`

Apparently the files were added in remote repository, no matter what was the content of `.gitignore` file in the origin.

As the files exist in the remote repository, git has to pull them to your local work tree as well and therefore complains that the files already exist.

`.gitignore` is used only for scanning for the newly added files, it doesn&#39;t have anything to do with the files which were already added.

So the solution is to remove the files in your work tree and pull the latest version. Or the long-term solution is to remove the files from the repository if they were added by mistake.

A simple example to remove files from the remote branch is to 

    $git checkout &lt;brachWithFiles&gt;
    $git rm -r *.extension
    $git commit -m &quot;fixin....&quot;
    $git push

Then you can try the `$git merge` again

If there are too many files to delete, which is actually a case for me. You can also try the following solution:

1) fetch

2) merge with a strategy. For instance this one works for me:

    git.exe merge --strategy=ours master


If you are getting error like 

* branch                master     -&gt; FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
        src/dj/abc.html
Please move or remove them before you merge.
Aborting

Try removing the above file manually(Careful). Git will merge this file from master branch.


It&#39;s clearly stated in the [docs][1] that int(number) is a flooring type conversion:

    int(1.23)
    1
and int(string) returns an int if and only if the string is an integer literal.

    int(&#39;1.23&#39;)
    ValueError

    int(&#39;1&#39;)
    1

Is there any special reason for that? I find it counterintuitive that the function floors in one case, but not the other.



  [1]: https://docs.python.org/3.5/library/functions.html#int

Counterintuitive behaviour of int() in python

The problem I have been struggling with for two weeks now while learning node.js is how to do synchronous programming using node. I found that no matter how I try to do things *sequentially* I always end up with nested promises. I have found that there are modules such as Q to help with promise chaining as far as maintainability.

What I don&#39;t understand while doing research is `Promise.all()`, `Promise.resolve()` and `Promise.reject()`. `Promise.reject` is pretty much self explanatory by the name but when writing an application I am confused on how to include any of these in functions or objects without breaking the behavior of the application.

There is definitely a learning curve to node.js when coming from a programming language such as Java or C#. The question that still resides is if promise chaining is normal (best practice) in node.js.

Example:

    driver.get(&#39;https://website.com/login&#39;).then(function () {
        loginPage.login(&#39;company.admin&#39;, &#39;password&#39;).then(function () {
            var employeePage = new EmployeePage(driver.getDriver());

            employeePage.clickAddEmployee().then(function() {
                setTimeout(function() {
                    var addEmployeeForm = new AddEmployeeForm(driver.getDriver());

                    addEmployeeForm.insertUserName(employee.username).then(function() {
                        addEmployeeForm.insertFirstName(employee.firstName).then(function() {
                            addEmployeeForm.insertLastName(employee.lastName).then(function() {
                                addEmployeeForm.clickCreateEmployee().then(function() {
                                    employeePage.searchEmployee(employee);
                                });
                            });
                        });
                    });
                }, 750);
            });
        });
    });

Are nested promises normal in node.js?

I am trying to do a `git pull origin master` from my server but keep getting the error:

`Please move or remove them before you can merge.`

There are no untracked files, but it seems like it has issues with the *ignored files* for some reason.

I tried running a `git clean -nd` to see what would be deleted and it lists a whole bunch of files that are ignored in `.gitignore`.

How can I fix this so I can do a pull?

Git pull - Please move or remove them before you can merge

I am trying to do a <code>git pull origin master</code> from my server but keep getting the error:
<code>Please move or remove them before you can merge.</code>
There are no untracked files, but it seems like it has issues with the ignored files for some reason.
I tried running a <code>git clean -nd</code> to see what would be deleted and it lists a whole bunch of files that are ignored in <code>.gitignore</code>.
How can I fix this so I can do a pull?

I&#39;ve accidentally pruned some remote branches and I don&#39;t really know what the consequence of this is (I clicked the &quot;Prune remote branches&quot; button in Git Extensions, thinking it would delete a remote branch).

The official documentation says &quot;git-prune - Prune all unreachable objects from the object database &quot;. I don&#39;t really understand what this means. I&#39;m guessing this might have removed merged branches but I&#39;m not really sure.


What is Git pruning?

git continues to confuse me with its unhelpful error warnings This one really deserves a prize:

    git merge is not possible because you have unmerged files

My situation: My master branch on github was edited (directly in the browser) while my local master branch was also edited.

I wrongly suppose you could simply merge the two versions and be done with it, but also, I cannot merge - because my files are unmerged.

    git merge remote/master

results in

    error: merge is not possible because you have unmerged files.
    hint: Fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39;
    hint: as appropriate to mark resolution and make a commit.
    fatal: Exiting because of an unresolved conflict.

So, after adding and committing the local change and then trying to merge again, I get:

    merge: remote/master - not something we can merge

Clearly I am missing something essential here... Do I have the wrong idea about what merging means? How do I fix this issue of having a different remote master / local master branch?

Git merge is not possible because I have unmerged files

I&#39;m new to source control; in the past, I&#39;ve manually backed up copies of files and made changes on clones then transferred changes manually to master files once debugged. I realize this is similar to how branches work with Git repositories, however I&#39;ve never used one.

I downloaded Git and made an account on GitLab, and started a new project. My site is hosted on a local server and my files are saved locally. How do I connect these files to a Git repository and continue developing with branches?

How to connect local folder to Git repository and start making changes on branches?

I tried to follow [this post][1] but got confused rather than getting my problem solved. 

Here is the scenario. 

I have created a branch like `git checkout -b &lt;branch_name&gt;`. I then worked on some changes and did

1. `git add .`
2. `git commit -m &quot;comment&quot;`

Now all those changes are in my uncommitted local `&lt;branch_name&gt;` branch. What i want to do is to push these changes upstream but i want to push it to a branch which doesn&#39;t exist e.g., `&lt;branch_name&gt;_test`

I don&#39;t want to push it to my `&lt;branch_name&gt;`. How can i do so. 


  [1]: https://stackoverflow.com/questions/1519006/how-do-you-create-a-remote-git-branch

Git pushing to remote branch

I&#39;m a noob in Git, and trying to learn the difference between `git pull` vs `git rebase`. Can someone provide an example when to use which option since I feel that both serve the same purpose.

Git Pull vs Git Rebase

We are working on integrating GitLab (enterprise edition) in our tooling, but one thing that is still on our wishlist is to create a merge request in GitLab via a command line (or batchfile or similar, for that matter). We would like to integrate this in our tooling. Searching here and on the web lead me to believe that this is not possible with native GitLab, but that we need additional tooling for that. 

Am I correct? And what kind of tooling would I want to use for this?

How to create a GitLab merge request via command line

I have two branches in git: `master` and `custom_branch`.

Somebody added some code to `master` that I need to use in my `custom_branch`. I tried this:

    git branch custom_branch
    git merge master

But when I do that, it says:

    Already up-to-date.

But, when I compare `master` and `custom_branch`, the changes are still not there. What am I missing?

P.S. I don&#39;t want to `rebase` since other people also use this branch.

Merging changes from master into my branch

I have a git repo with `mainline` (equivalent to `master`) and some local feature branches.  For example:

    $ git branch
    * mainline
      feature1
      feature2
      feature3

When I do the following, I am able to squash merge all of my edits in a feature branch into one commit to `mainline`:

    $ git checkout mainline
    $ git pull
    $ git checkout feature1
    $ git rebase mainline
    $ git checkout mainline
    $ git merge --squash feature1
    $ git commit
    $ git push

My question is, at this point, when I try to delete the `feature1` branch, it tells me it is not fully merged:

    $ git branch -d feature1
    error: The branch &#39;feature1&#39; is not fully merged.
    If you are sure you want to delete it, run &#39;git branch -D feature1&#39;.

What causes this error? I thought `git merge --squash feature1` merged `feature1` into `mainline`.

git: why can&#39;t I delete my branch after a squash merge?

I am new to GIT, so far I had been using Visual Studio Online TFS for my version control and I am the **only** developer. When I created my last project I was kind of mislead into thinking GIT was the best option for this.

So I checked-in my master. Then when I was going to work on a Feature I read I had to create a branch (this was not necessary in TFS) so I created &quot;development_print&quot; as a new branch and worked on my feature.

Now my feature is complete but I don&#39;t know how to merge it back into master. I am not interested in multiple branches at the moment, just want my new feature merged into master and remain with master.

In VS there is a **merge branch** option but it only allows me to merge into development_print (I want my feature into master!) so it does not let me set Into Current Branch and for Merge From Branch shows: 

 - Development_print
 - master
 - origin/development_print
 - origin/master

which is kind of confusing? it seems all backwards. So how do I get out of this mess without losing all the work I did on the feature?

Visual Studio 2015 How to merge a branch into master?

I am working on a project using Git as the VCS. I got a branch `xyz` cut from the mainline branch of master. After working for a while, I committed my code and took a pull of the branch mainline.

The pull was fine. I then merged the code with master. After the merge, there were problems in certain files. I have not committed the code after merging. Can someone please guide as to how I can abort this merge and bring my branch where I am working currently to the state where it was before I merged it?


Abort a Git Merge

I am having difficulty in doing a pull from `origin`. I keep getting:

&gt; &quot;Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.&quot;

This also applies to switching branches. I get a similar sort of message, but this does not always happen.

I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local `master` branch, and development branches. Every time I switch to `master` and then I do a pull I get the error message. I have resorted to doing a stash and drop stash (command line) and sometimes I use [TortoiseGit][1] to do the pull and it works.

What is strange is even if I try to revert (on the uncommitted files) using TortoiseGit it shows that it was reverted successfully (I have already tried Visual Studio undo, nothing happens). Trying to pull again, it is still the same problem. The uncommitted files will be there and sometimes when I do a `git status` it says there is nothing to commit.

Just a note: This can happen even after switching from a branch onto `master`. In this case there is no way there can be uncommitted changes, because I would not have been able to switch in the first place.

I am still new to Git, but I would like to know if there is a better way of solving this as I would like to use one environment instead of using switching between different environments for each task; it&#39;s easier for me to just do everything from Visual Studio. I have already read up on:

*https://stackoverflow.com/questions/26885057/tfs-git-in-vs-cannot-switch-to-master-because-there-are-uncommitted-changes*

**UPDATE**

It seems like this problem has to do with line endings.

By doing a `git diff -R` you can see that a line ending has been added, &quot;^M&quot;, and it is different. Removing the `* text=auto` in gitattributes (then check for changes) and putting it back on again so that the gitattributes does not signal a change of itself that needs to be committed seems to help, there will not be any changes.

  [1]: http://en.wikipedia.org/wiki/TortoiseGit


Visual Studio 2015 Git error message &quot;Cannot pull/switch because there are uncommitted changes&quot;

I don&#39;t understand the difference between `git pull --rebase` and `git rebase`, without any other options.

I don&#39;t understand if they are safe, a good practice, or very dangerous.

Can I break the history of commits by doing a `git pull --rebase` in local?


git pull --rebase vs git rebase : what&#39;s the danger?

I&#39;m learning git, and I&#39;m following the Git community book. 

Previously (long time ago) I made a public repository on Github, with some files. Now I set up a local Git repository on my current computer, and committed some files. Then I added a remote pointing to my Github page:
 
    [root@osboxes c]# git remote add learnc https://github.com/michaelklachko/Learning-C

That seemed to be successful: 

    [root@osboxes c]# git remote show learnc
    * remote learnc
      Fetch URL: https://github.com/michaelklachko/Learning-C
      Push  URL: https://github.com/michaelklachko/Learning-C
      HEAD branch: master
      Remote branch:
        master tracked
      Local ref configured for &#39;git push&#39;:
        master pushes to master (local out of date)


Now I want to download the files from my Github repo to my computer. I did this:

    [root@osboxes c]# git fetch learnc
    [root@osboxes c]# git merge learnc/master
    warning: refname &#39;learnc/master&#39; is ambiguous.
    Already up-to-date.

However, I don&#39;t see any new files in my local directory. How can I get them? 

I also tried to do this:

    [root@osboxes c]# git pull learnc master
    From https://github.com/michaelklachko/Learning-C
     * branch            master     -&gt; FETCH_HEAD
    fatal: refusing to merge unrelated histories

BTW, locally I&#39;m on master branch (there are no other branches):


    [root@osboxes c]# git status
    On branch master
    nothing to commit, working directory clean




 

Trying to pull files from my Github repository: &quot;refusing to merge unrelated histories&quot;

When I do a `git pull`, from the git bash, the terminal usually runs the pull, updates my local, and then hangs. I&#39;m not sure if it&#39;s waiting for me to do something, but I usually exit out of this with `CTRL-C`. After that, I get that an index.lock is preventing me from doing other things to which I have to delete it. Am I misunderstanding how `git pull` works?

Why does git pull hang?

I was using a username password for pushing my code. It was working for several months, but suddenly I&#39;m not able to do it and am getting this error:

```
Username for &#39;https://github.com&#39;: shreyas-jadhav
Password for &#39;https://shreyas-jadhav@github.com&#39;:
remote: Password authentication is temporarily disabled as part of a brownout. Please use a personal access token instead.
remote: Please see https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations/ for more information.
```

Please note that the link doesn&#39;t help. Even using the generated token doesn&#39;t help.

&gt; **Moderator Note:** This is [part of a planned and soon-to-be permanent service change by GitHub](https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/)



Content Type	Original Author	Original Content on Stackoverflow
Question	Brett	View Question on Stackoverflow
Solution 1 - Git	Neha	View Answer on Stackoverflow
Solution 2 - Git	DURGESH	View Answer on Stackoverflow
Solution 3 - Git	Zbynek Vyskovsky - kvr000	View Answer on Stackoverflow
Solution 4 - Git	David	View Answer on Stackoverflow
Solution 5 - Git	Deepak G	View Answer on Stackoverflow

Git pull - Please move or remove them before you can merge

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

Are nested promises normal in node.js?

Counterintuitive behaviour of int() in python

Attributions