How do I get the latest version of my code

Question

I m using Git 1 7 4 1  I want to get the latest version of my code from the repository  but I m getting errors    git pull      M   selenium ant build properties      M   selenium scripts linux get latest updates sh M   selenium scripts windows start-selenium bat Pull is not possible because you have unmerged files  Please  fix them up in the work tree  and then use  git add rm  lt file gt   as appropriate to mark resolution  or use  git commit -a    I ve deleted the local copies of the files the tool is complaining about  but I still get the errors  How do I check out the latest version from the remote repository

User · Answer

I understand you want to trash your local changes and pull down what's on your remote?

If all else fails, and if you're (quite understandably) scared of "reset", the simplest thing is just to clone origin into a new directory and trash your old one.

User · Answer

Case 1  Don   t care about local changes   Solution 1  Get the latest code and reset the code  git fetch origin git reset --hard origin  tag branch commit-id usually  master   Solution 2  Delete the folder and clone again  D  rm -rf  project folder  git clone  remote repo     Case 2  Care about local changes   Solution 1  no conflicts with new-online version  git fetch origin git status   will report something like   Your branch is behind  origin master  by 1 commit  and can be fast-forwarded    Then get the latest version  git pull  Solution 2  conflicts with new-online version  git fetch origin git status   will report something like   error  Your local changes to the following files would be overwritten by merge      file name Please  commit your changes or stash them before you can merge  Aborting   Commit your local changes  git add   git commit -m    Commit msg      Try to get the changes  will fail   git pull   will report something like   Pull is not possible because you have unmerged files  Please  fix them up in the work tree  and then use  git add rm  lt file gt   as appropriate to mark resolution  or use  git commit -a     Open the conflict file and fix the conflict  Then   git add   git commit -m    Fix conflicts    git pull   will report something like   Already up-to-date     More info  How do I use   39 git reset --hard HEAD  39  to revert to a previous commit

User · Answer

To answer your questions there are simply two steps -  Pull the latest changes from your git repo using git pull Clean your local working directory having unstaged changes using git checkout --    This will show the latest changes in your local repo from your remote git repo  cleaning all the local unstaged changes   Please note git checkout --   will discard all your changes in the local working directory  In case you want to discard any change for selective file use git checkout --  lt filename gt   And in case you don t want to lose your unstaged changes use git stash as it will clean your local working directory of all the unstaged changes while saving it if you need it in the future

User · Answer

It sounds to me like you re having core autocrlf-problems  core autocrlf true can give problems like the ones you describe on Windows if CRLF newlines were checked into the repository  Try disabling core autocrlf for the repository  and perform a hard-reset

User · Answer

If you just want to throw away everything in your working folder  eg the results of a failed or aborted merge  and revert to a clean previous commit  do a git reset --hard

User · Answer

By Running this command you ll get the most recent tag that usually is the version of your project    git describe --abbrev 0 --tags

User · Answer

If you are using Git GUI  first fetch then merge   Fetch via Remote menu    Fetch    Origin  Merge via Merge menu    Merge Local   The following dialog appears      Select the tracking branch radio button  also by default selected   leave the yellow box empty and press merge and this should update the files   I had already reverted some local changes before doing these steps since I wanted to discard those anyways so I don t have to eliminate via merge later

User · Answer

try this code  cd  go to path git pull origin master

User · Answer

If you don t care about any local changes  including untracked or generated files or subrepositories which just happen to be here  and just want a copy from the repo   git reset --hard HEAD git clean -xffd git pull   Again  this will nuke any changes you ve made locally so use carefully  Think about rm -Rf when doing this

User · Answer

If the above commands didn t help you use this method   Go to the git archive where you have Fork Click Settings gt  Scroll down and click Delete this repository Confirm delete Fork again  and re-enter the git clone  lt url git gt  You already have the latest version

User · Answer

You have to merge your files first  Do a git status to see what are the files that need to be merged  means you need to resolve the conflicts first   Once this is done  do git add file merged and do your pull again

User · Answer

I suspect that what s happened may be that you ve deleted the files that you modified  because you didn t care about those changes  and now git is taking the deletion to be a change   Here is an approach that moves your changes out of your working copy and into the  stash   retrievable should it actually turn out that you ever need them again   so you can then pull the latest changes down from the upstream   git stash   git pull   If you ever want to retrieve your files  potential conflicts with upstream changes and all   run a git stash apply to  stick those changes on top of your code   That way  you have an  undo  approach

[git] How do I get the latest version of my code?

Examples related to git