0
Allow opening the conflict solver without an actual conflict
The 3-way view in the conflict solver, and especially the base changes view, are extremely useful when investigating whether a change is still relevant during a rebase. It would be very useful if we could open the conflict solver on a staged file without an actual conflict, while rebase is paused.
Customer support service by UserEcho
Which file contents should be used in this case? Given such a working tree state, can you give appropriate Git commands to retrieve these file contents?
Which file contents should be used in this case? Given such a working
tree state, can you give appropriate Git commands to retrieve these file
contents?