I'm currently working on a branch made from develop branch, but theres a team that was working and commiting their work to master branch, so I added and commited all my stuff to my working branch. I decided to merge master into develop, so I changed to develop made a pull, changed to master and made a pull... but if I do a git status it shows untracked files, if I switch back to develop and do git status the untracked files are gone, what am I missing?
EDIT: adding more info the repo is divided into two directories, one for frontend (I'm doing the source for frontend) and one directory for the backend code (the other team is working in this code). For some reason they started to work directly with master branch instead of develop, while I was pushing to develop. That why I needed to merge master into develop, so they can start working from develop and not master.
finished working on my feature-branch did:
- git add .
- git commit -m "commit message"
- git checkout develop
- git pull
(git says nothing to update)
- git checkout master
- git pull
(git says Fast-forward - 31 files changed, 1003 insertions(+), 63 deletions(-))
- git status
(git shows untracked directory)
- git checkout develop
- git status
(git doesn't show untracked directory)
UPDATE: having checked out master, did:
- git add .
(git started adding directories it shouldn't, like for example node_modules inside the frontend directory)
Could it be some sort of .gitignore missconfiguration?