Visual Studio merge problem.

  • Thread starter Thread starter JoshuaEirm
  • Start date Start date
J

JoshuaEirm

Guest
I am working with Visual Studio and git. When I choose merge and there are conflicts, there are two choices with four hyperlinks:


filename1 source diff

filename2 target diff


What is this about?


Thank you,

Josh

Continue reading...
 

Similar threads

S
How to interpret Git history graph for a branch?
Replies
0
Views
384
shiftbit
S
J
Git Not Working with Project on Network Drive
Replies
0
Views
241
jeaboswell
J
R
AVX512 in ML64.EXE (MASM) with Visual Studio 2019 Community
Replies
0
Views
252
rcgldr
R
E
Dll file writing problem
Replies
0
Views
250
Eldeeb92
E
S
How to interpret Git history graph for a branch?
Replies
0
Views
355
shiftbit
S
Back
Top