Select a scenario
Learn to resolve Git conflicts!
Accept Current Change
|
Accept Incoming Change
|
Accept Both Changes
<<<<<<< HEAD (Current Change)
=======
>>>>>>> feature-branch (Incoming Change)