Search Results

Search found 2 results on 1 pages for 'chalup'.

Page 1/1 | 1 

• What are the differences between GIT and SVN when it comes to merge conflicts solving.

  - by chalup

  I keep hearing that branching in git is so much easier than in SVN, because it's easier to merge the branch back to trunk/master. I've read some tutorials, but they only covered basic merge conflicts ("Alice changed line 8 of code.cpp and at the same time Bob changed line 8 of code.cpp...") and there are no differences between SVN and all other…

  Read the article

• How to invoke make install for one subdirectory of Qt project

  - by chalup

  I'm working on custom library and I wish users could just use it by adding: CONFIG += mylib to their pro files. This can be done by installing mylib.prf file to %QTDIR%/mkspec/features. I've checked out in Qt Mobility project how to create and install such file, but there is one thing I'd like to do differently. If I correctly understood…

  Read the article

1