29 Nov
2012
29 Nov
'12
22:41
On Monday 2012-11-05 10:03, Adrian Schröter wrote:
4. If not, presumably there is some equivalent of 'osc pull' which applies to branches rather than linkpac'd packages?
"osc pull" works on branches!?
If `osc up` notified you that conflicts arose, then `osc pull` is what seems to be needed to actually attempt the merge and add conflict markers. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org