It is possible that I have several branches
--develop
---foo
---bar
And for example, I have changes in foo, but I want to go to , barbut WITHOUT committing the changes in foo, is there a way to save them "temporarily" without the need for them to appear in the commit history ?
I've run into a conflict when merging a branch into my develop .
gitIt couldn't resolve it automatically and I have found that I have edited the file including this:
<<<<<<< HEAD
some code
=======
some other code
>>>>>>> develop
I have been able to solve it manually by editing the file and giving it commit, but the question remains, what is HEAD? I assume that develop is also the develop branch where you would merge, is that correct?
Suppose my branch is named foo and I want to merge it into develop (both locally).
What specifically are the differences between making a git pulland making a git fetch?