I would like to know what is the flow to update a branch to develop , since I am having problems.
From the branch develop I made:
git checkout -b feature/test
I made the changes in the feature/test branch and then I made commit and push to feature/test .
As time passed, the branch develop was updated then to update my branch I made:
git checkout develop
git pull
git checkout feature/test
git merge develop
And here my problem started since when doing the git status these files of develop were put in the list to be commiteed and when I did git add , commit and push; when I get into github and make a comparison between develop and feature/test it turns out that the initial change appears in the feature/test , that is, the file when merge detects a change in the file that does not correspond with develop .
Then in github appears in my branch the changes mixed with the supposed update to develop .