Synchronization with Team Explorer in VS 2015

Question

Synchronization with Team Explorer in VS 2015

Navigation

#1 by (1 votes)

1

When trying to make a Sync I get the message:

Can not pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.

When trying to push, I get the message:

You can not push branch master to remote origin because there are new commits in the remote repository's branch. Pushing this branch would result in a non-fast-forward update on the branch in the remote repository.

Correct would be to merge, right? But I get the message:

An error occurred. Detailed message: 1 uncommitted change would be overwritten by merge

Where do I resolve this conflict?

In advance, thank you

Diogenes

git visual-studio-2015

asked by anonymous 04.01.2016 / 23:47

1 answer

Perform update and insert in mysql via asp classic Remove "www" from domain by doing 301 redirect

score 1 · Answer 1

You may have (new / changed) files that are not in your Untracked files ).

You can identify them by Git prompt . Navigate to the root directory of the project / repository (eg cd c: / Documents / YourRepository ), type "git status"

Notethatthe"octocat.txt" file is not being crawled (it's an untracked file ).

If you would like to commit the files, add them to your commit, type git add. git add octocat.txt " strong>.

Then type git commit -m "Commit text here!" to create a commit.

Otherwise, discard them ( see the documentation here for more details before running the commands ), you could use < git reset --hard git reset filename . To undo unwanted changes you could use git checkout - filename .