27 Apr
2016
27 Apr
'16
10:42
Olaf Hering <olaf@aepfle.de> writes:
On Wed, Dec 16, Olaf Hering wrote:
What is the prefered way to merge changes in the devel project?
The question still stands. The suggested 'osc pull' does not seem to work for me, with TW:
An unexpanded working directory cannot have conflicts. You need to expand first. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org