[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fw: Merge conflict
From: |
Phil Holmes |
Subject: |
Fw: Merge conflict |
Date: |
Sun, 5 Jan 2014 13:17:47 -0000 |
----- Original Message -----
From: "Phil Holmes" <address@hidden>
To: "Devel" <address@hidden>
Sent: Sunday, January 05, 2014 12:19 PM
Subject: Merge conflict
I'm trying to create a 2.19.0 build and running into merge conflicts.
Following the CG, I've done:
git fetch
git checkout release/unstable
git merge origin/master
This creates a number of merge conflicts: changes.tely is an obvious one.
Is there something that can be simply done to sort the conflicts out?
--
Phil Holmes
Forwarding from a different email address.
--
Phil Holmes
- Fw: Merge conflict,
Phil Holmes <=