I have 2 branches: devl, acpt. Typically all the users make changes in the devl and when ready to deploy merge it to acpt. At some point someone must have done something which made a file different in the branches. running a git merge in acpt branch from devl doesn't seem to be merging the file from devl branch to acpt.
>git status > > On branch acpt > > Your branch is up-to-date with 'origin/acpt'. > > nothing to commit, working tree clean > > >git diff --name-only devl acpt > > etc/system.js > > I want to merge this file from devl to acpt branch. git merge doesn't seem to be doing. Can someone help > >git merge devl > > Merge made by the 'recursive' strategy. > > > git diff --name-only devl acpt > > etc/system.js > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/661253f0-6d4e-4bf1-89cc-9587541b8a02%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
