When, for example, a conflict arises between two files and there’s no sense in manually resolving the conflict line by line, you can fully accept changes from one side. The following commands are used for this:
Accept changes from the other side
git checkout --theirs .
git add .Accept changes from your own side
git checkout --ours .
git add .N.B.
The dot (.) at the end of the command means that the operation applies to all conflicting files. If you want to apply the command to a specific file, specify the path to that file instead of the dot.