How to merge branches like Branch and origin/Branch?

Question

Hard disks

Good afternoon, one of the developers created two branches name and origin / name, searched all over Google, they write that they should be synchronized, but, in the origin / name branch there are changes that are extremely important, but they are not in the name branch.
When merge origin/name git says Already up to date.
Please tell me how to solve this problem? By the way, I'm new to git.

Answer 1

the system started to slow down wildly, after rebooting the hdd, the disk was no longer detected by the system

From the description it looks like the hard drive has failed. Check on another computer, if not detected, change to a working one.

Answer 2

1) Change the SATA cable to the HDD.
If the disk is not visible, then
2) Connect the SATA cable to another SATA port on the motherboard.
If the disk is still not visible, and the hands are not completely crooked, then
2) Unscrew the HDD board and gently wipe the contacts of the disk heads on it with an eraser. Two rows of contacts.
Screwdriver there torx T8 or T6.

Answer 3

Does the drive make any extraneous sounds when power is applied (clicks / knocks, rattles, squeaks / buzzes, etc.)?
If yes, and you need information from it, then turn off the disk and stop trying - alas, nothing can be done at home.

Answer 4

For starters: there is the concept of local (local) and remote (remote) repository.
origin is a synonym for a remote repository, i.e. origin/ name is the remote branch, and just name is the corresponding local branch.
The remote repository is used as a centralized repository that developers synchronize with using git pull origin/name. This is a sequential execution of git fetchand git merge. Fetch fetches changes from the remote repository, and merge tries to apply them to the corresponding local branches.
If you are a beginner, I advise you to learn at least the basics of Git. A great way to do this is to read https://git-scm.com/book carefully .
Helpful chapters:

• Working with remote repositories
  
• About branching in a nutshell