<div>
<div class="content wysiwyg-content">
I have done some local changes in code stored in Git repo. I don't need these changes anymore, so I would like to discard them and get a clean copy from github.<br />
<br />
When I did a Git pull it gave me a merge conflict error.<br />
<br />
So, I did <br />
<br />
git reset --hard<br />
<br />
but that did not help. I also tried <br />
<br />
git stash<br />
<br />
but still when I try pull from github, it does not allow me to do so.<br />
<br />
Can someone please suggest what would be the best approach to get the latest code from github. Should I just delete the local files and then do a git pull?
</div>
</div>


I have done some local changes in code stored in Git repo. I don't need these changes anymore, so I would like to discard them and get a clean copy from github.

When I did a Git pull it gave me a merge conflict error.

So, I did 

git reset --hard

but that did not help. I also tried 

git stash

but still when I try pull from github, it does not allow me to do so.

Can someone please suggest what would be the best approach to get the latest code from github. Should I just delete the local files and then do a git pull?

Git - reset local changes

Git is a version control system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed for Linux kernel development. As with most other distributed version control systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.