The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running This will track all files, remove all of your local changes to those files, and then … Read more
I don’t blame you for getting frustrated about this. The best way to look at is this. There are potentially three versions of every remote branch: The actual branch on the remote repository(e.g., remote repo at https://example.com/repo.git, refs/heads/master) Your snapshot of that branch locally (stored under refs/remotes/…)(e.g., local repo, refs/remotes/origin/master) And a local branch that might be tracking the … Read more
When you try to merge one commit with a commit that can be reached by following the first commit’s history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together – this is called a “fast-forward.” For more : http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging In another way, If Master has not diverged, instead … Read more
The Problem There are a number of work-flows you can use. The main point is not to break history in a published branch unless you’ve communicated with everyone who might consume the branch and are willing to do surgery on everyone’s clones. It’s best not to do that if you can avoid it. Solutions for … Read more
-p let’s you select the hunks that should be stashed; whole files can be selected as well. You’ll be prompted with a few actions for each hunk:
Expanding what I wrote in a comment The general rule is that you should not rewrite (change) history that you have published, because somebody might have based their work on it. If you rewrite (change) history, you would make problems with merging their changes and with updating for them. So the solution is to create … Read more
What is currently happening is, that you have a certain set of files, which you have tried merging earlier, but they threw up merge conflicts. Ideally, if one gets a merge conflict, he should resolve them manually, and commit the changes using git add file.name && git commit -m “removed merge conflicts”. Now, another user has … Read more
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running This will track all files, remove all of your local changes to those files, and then … Read more
You can think of the HEAD as the “current branch”. When you switch branches with git checkout, the HEAD revision changes to point to the tip of the new branch. You can see what HEAD points to by doing: In my case, the output is: It is possible for HEAD to refer to a specific revision … Read more
Alright with the help of the other two answers I’ve come up with a direct solution: