[Qt-creator] merge conflict in git submodule src/shared/qbs

[Jochen Becher]

I followed the git book doing a "git add src/shared/qbs" and commited
all merged changes (no further conflicts). Why did I have to add qbs
manually?

Regards, Jochen


Am Freitag, den 31.07.2015, 19:38 +0200 schrieb Jochen Becher:
> Hi,
> 
> I am not very good in git: I pulled qtcreator master and got merge
> conflict in submodule src/shared/qbs (I assume due to new qbs version,
> right?) How do I solve this conflict?
> 
> Regards, Jochen
> 
> 
> _______________________________________________
> Qt-creator mailing list
> Qt-creator at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/qt-creator