Friday, 15 August 2014

How do I create a criss-cross merge successfully in Git? -


I have to test a bug fix and I need to create a cross-cross merge between the two branches too many documents And I am quite new to Git. I am not submitting code, just checking the functionality of our code review system

Read a simple text that I am using to make changes.

You are talking about this scenario:

I also : There is a try to generate, but git is not unsuccessful with an error, I think it is to solve strategy which maximizes the conflict, at least it That's what git (vers 1.8.3.rc1) gave me to solve when I re-submitted it.

No comments:

Post a Comment