The bottom line is:
There are two servers - combat and dev. On virgins there are two branches git - dev and master. Accordingly, the logic of work is as follows: developers push in dev - an assembly is made on a virgin - everything is OK - master merditsya from dev - dev merditsya from master - an assembly is made on the combat from master. But there was a problem. Apparently, someone made changes directly to a file on a remote server through the console (yes, ay-ay-ay, accesses are available directly) and when using the MASTER merge with DEV, these manual changes did not appear in the DEV branch, but when switching to master, there are changes, although there were no commits with it.

The question is: can someone explain the nature of the phenomenon? According to my junky standards, it seems as though the master is keeping the finished "imprint" of the assembly with the changes made, but he doesn’t see the changes, hence he has nothing to do from the master in dev.

  • If there are changes and there are no commits, maybe it’s worth committing them and trying to match? - Taarim
  • If you merge the "dirty" branch (where there are any changes in the working directory: untracked, or tracked in the index) on the other, the merge will succeed (or with conflicts). But the "same" changes will remain changes, there will be no changes in them. You need to understand that there is a repository, there is a working directory of this repository. And there are repositories without a working directory (bare-repositories). - Total Pusher

0