If I was developing on my feature branch with some uncommited changes and I need the latest changes from the develop branch. I’m sure there are many options to get them but I wanted to know, if the following two end up in the same result:
-Commiting my changes and merging develop into feature
-stashing my changes, merging develop into feature and applying the stash back onto the feature branch

I was also wondering if the ‘direction’ of a merge does matter. If I merge develop into feature or feature into develop. I mean if you would compare the two resulting branches. I guess this is also what the first question boils down to.
For all of this it is given that you resolve conflicts the same way.

I have surely done both before but I don’t know if I can be sure that both results are equal.