H
H
habrdima2020-05-24 12:36:30
git
habrdima, 2020-05-24 12:36:30

Can I only use changes in git to resolve conflict?

Learning Git

realized that git saves the information of the moment I changed, tints red and green

Question: can I use only these changes and not the entire text of the file to resolve the conflict?

The task is to move the late commit a few commits back, for example, from 5 commits from 5th place to 2nd.
I use git rebase -i for this task.
The 5th is full of changes from previous commits, but in the 5th itself I deleted the line, all this for an example

Git in conflict suggests choosing either the entire 1st commit or the entire 5th commit, this it's not convenient
if it was possible to compare only the change from the 5th commit,
that is, a reminder that in the 5th I added or deleted something.
Is it possible?

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question