Do I use tortoisegit merging branches, right-click on the merger, to master the main branch merge to-CodePudding

For example, I put the dev branch down to the local, and then hope to combine the master branch to come in to this and I right click on the merger, choose the master branch, could you tell me why the master a folder below there are five files, dev has three, the combined dev or 3, could you tell me more 2 why didn't come in, but the other files in the master something changed or prompt conflict, this is no problem

CodePudding user response:

Only dev to master's, did not say the dev, then the master to the local again