Re: [tsc-devel] Repository has been renamed
Chris Jacobsen |
Sat, 04 Oct 2014 09:03:26 UTC
The problem was that it was reporting conflicts in release 2.0when I had not changed anything. It made no sense. It was faster just to redownload the .git file from scratch and redo the MXE setup, etc.
Is there a manual wrap setting, and is it accessible from gmail oryahoo? Typing a carriage return every 80 characters does notreally make sense.
-datahead
On Saturday, October 4, 2014 3:31 AM, Quintus <…s@q…> wrote:
Chris Jacobsen <…9@y…> writes:
> More unexplained conflicts just like the pot conflict I discussed with Quintus earlier...? Now they're in cpp files.The only safe thing to do is to download the whole git file and redo all the build configurations for MXE and CMake from scratch.
Please wrap your emails at around 60-80 characters, so that I don’t have
to manually do that in my mail client; also the web archive won’t
autowrap them.
If the renaming of code is done in the release branch first, which is
then merged into devel, there shouldn’t be any serious conflicts on
merging. I can’t follow you on the redownloading thing; which problem do
you want to resolve with that?
Valete,
Quintus
--
Blog: http://www.quintilianus.eu
I will reject HTML emails. | Ich akzeptiere keine HTML-Nachrichten.
|
Use GnuPG for mail encryption: | GnuPG für Mail-Verschlüsselung:
http://www.gnupg.org | http://gnupg.org/index.de.html