Git command for update your "branch" without lost your data mods

[tmav94]

Hi guys...i do theses steps:

 

1 - git clone https://github.com/HerculesWS/Hercules.git ~/Hercules 


One mounth later...
 

2 - git checkout myfolder3- git pull origin master 

And i lost everything that i have done...


How to update it whitout lose things? But...keep the branch up-to-date?

 

[Dastgir]

git commit -am"commit message for your changes"

git pull

Merge conflicts by hand if any.

In above case you have created new branch named myfolder.

Git checkout master

^ will bring back to.master Branch

 

[Conflicts]

I believe what you're looking for is;

git stash save && git pull && git stash pop