Git Push/Pull VS 2015 Issue

Question

So, I'm just getting this issue resolved with my .suo file, and now I get this screen. I can't push or pull. I get this error when trying to push from my Desktop, however my Laptop is able to push. Now, another, and most important note, is that the code (the actual files - project files) actually exist in the cloud as this is a Telerik AppBuilder application which I am using VS2015 as my IDE.

Now, to recap the problem: My Laptop can Push/Pull, my desktop cannot (see my comments and image below); however I do have a "latest" version of the code (in the cloud) as a good base.

Please keep in mind considerations:

I am using TFS and would like to link my TFS Tasks with check-ins (for later reference). (See pending checkins? I have them associated with TFS tasks, so I would prefer not to loose them and rebase...)

What is my best way forward?

Possible duplicate of [rejected master -> master (non-fast-forward)](http://stackoverflow.com/questions/11696295/rejected-master-master-non-fast-forward) — Scott Weldon, Aug 24 '16 at 17:46
Your best way forward is to read about basic git workflows and understand them without opening Visual Studio at all. — Paul, Aug 25 '16 at 16:53

score 1 · Answer 1 · answered Aug 24 '16 at 17:39

1

Moved from a comment.

You can't push when you are behind the branch head. That is written out in plain english in the alert.

You can't pull (fetch+merge) when you have uncommitted changes to one of the affected files.

So, you probably need to: Stage your files, commit, pull, fix conflicts + stage/commit them, then push.

Hope that helps. I don't use VS, so I can't tell if you have any unstaged/uncommitted changes. That is my guess.

answered Aug 24 '16 at 17:39

Matthew Blancarte

8,251
2
25
34

1

I have just updated my question. Does this change your answer? – Robert Green MBA Aug 25 '16 at 16:50
Can you commit (without pushing) your local files? Try that first, and get back to me. – Matthew Blancarte Aug 25 '16 at 17:10
1

How can I commit w/o pushing local files? On my desktop (which is the screen above) I have already committed but cannot push to Git. – Robert Green MBA Aug 26 '16 at 02:14
If you've already committed, you need to now pull. Please read my answer again in detail. Commit, pull, push. – Matthew Blancarte Aug 26 '16 at 03:23

score 0 · Answer 2 · answered Aug 24 '16 at 17:35

0

That looks like someone else has committed changes to the branch and you haven't pulled them into your local branch. You need to do that and resolve any conflicts that may show up. Once that is done you can push your changes to the branch

answered Aug 24 '16 at 17:35

Dave V

1,966
9
18

When I try to pull it says: Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. – Robert Green MBA Aug 24 '16 at 17:38
1

I have just updated my question. Does this change your answer? – Robert Green MBA Aug 25 '16 at 16:50

score 0 · Answer 3 · answered Aug 24 '16 at 17:41

0

if you have uncommitted changes you need to commit them. afterwards, you should pull changes from origin master and solve conflicts if needed, and then you could push your changes to remote.

answered Aug 24 '16 at 17:41

Hila Tsfony

1

1

I have just updated my question. Does this change your answer? – Robert Green MBA Aug 25 '16 at 16:50
If the error message hasn't changed, then unfortunately no,it doesn't change it. There are still changes you haven't pulled in, and you have to do that before you can push your changes up. Those changes you need to pull in would overwrite some of your local changes, that's why you are getting the message – Dave V Aug 25 '16 at 16:54

Git Push/Pull VS 2015 Issue

3 Answers3