How to resolve a conflict if the front-end developer is in another city, and the conflicts are on the front and back?

Question

git

How to resolve the conflict if, when merging with the master, conflicts are knocked out both with server files and with front ones, if the front department in another city is working? I will solve my backend, but the front is immediately necessary. Just call up via video and fumble the screen, or can it be more elegant?

Answer 1

It's more elegant just to buy tickets and go to another department :)

Answer 2

Front and back in separate branches, for example frontend and backend. Pull requests from these branches to one, for example develop. Conflicts will be separate and each author of his branch (frontend, backend) let him resolve them himself until the pull request turns green.
Where one or another developer is physically located is not important. Git is just about separate and independent work, including (if not primarily - remote).

Answer 3

If you have a change in front and back in one commit, then they were made by one person, which means he can resolve conflicts.
If you have changes in different commits, then everything is simple: front-end developers rebase front-end commits to master, back-end developers rebase back-end commits to master. All conflicts are resolved during the rebase. After the rebase, everything is easily merged into the master, because the conflicts are resolved.