U++ forum: Welcome to the forum

Status & Roadmap

Authors & License

Funding Ultimate++

Search on this site

Search in forums

Home » Community » U++ community news and announcements » SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

Return to the default flat view

Create a new topic

Submit Reply

Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 [message #18778 is a reply to message #18211]

Mon, 20 October 2008 21:02

mr_ped is currently offline

mr_ped
Messages: 825
Registered: November 2005
Location: Czech Republic - Praha

Experienced Contributor

Basically when you modify files and then update from repository, SVN will try to merge the changes together. In case you did edit different part of file than the new change available in the repository, SVN will merge it automatically.
In case both you and someone else did edit the same line of file, and the result is different, you will get "conflict".

Try to check SVN book for more information how to work with SVN.
http://svnbook.red-bean.com/en/1.5/index.html

For example there's also chapter how to resolve conflicts, but you should try to fly trough whole content of it. It's not that huge and it will maybe explain you the basic principles.

Anyway, conflicts and merging are not that great in SVN, especially merging between different branches is somewhat more difficult, then it has to be, at least GIT looks more powerful in this aspect. But I can assure you SVN is very luxury way how to handle changes - when compared to some more historical options, like doing backups by hand or some years ago I did met MS Source Safe, and it was more like Source Lose than Safe. Very Happy

Very Happy

But it takes some time to get used to SVN and to learn how to use it in smart way, just like C++. It's powerful, but easy to use in wrong way and cause you big headache later.

Report message to a moderator

Send a private message to this user

[Message index]

		SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mdelfede on Tue, 16 September 2008 23:43
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mirek on Wed, 17 September 2008 08:09
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mdelfede on Wed, 17 September 2008 20:21
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mirek on Wed, 17 September 2008 21:36
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mdelfede on Wed, 17 September 2008 22:12
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mirek on Fri, 19 September 2008 10:12
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: bytefield on Fri, 19 September 2008 11:25
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mdelfede on Fri, 19 September 2008 15:04
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: captainc on Fri, 19 September 2008 15:55
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mirek on Fri, 19 September 2008 18:14
		SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: mdelfede on Sat, 18 October 2008 21:05
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: forlano on Sun, 19 October 2008 09:42
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: bytefield on Sun, 19 October 2008 11:51
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: mirek on Sun, 19 October 2008 15:21
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: forlano on Sun, 19 October 2008 15:44
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: mdelfede on Mon, 20 October 2008 14:13
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: forlano on Mon, 20 October 2008 19:34
		Re: SVN UPDATE & .deb BUILD : Revision 539 - 2008-10-18 By: mdelfede on Mon, 20 October 2008 22:26
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mr_ped on Mon, 20 October 2008 21:02
		Re: SVN UPDATE & .deb BUILD : Revision 453 - 2008-09-16 By: mr_ped on Tue, 21 October 2008 07:57
		SVN UPDATE & .deb BUILD : Revision 567 - 2008-10-25 By: mdelfede on Sat, 25 October 2008 00:26
		SVN UPDATE & .deb BUILD : Revision 571 - 2008-10-29 By: mdelfede on Wed, 29 October 2008 14:19
		SVN UPDATE & .deb BUILD : Revision 588 - 2008-11-01 By: mdelfede on Sat, 01 November 2008 17:12
		SVN UPDATE & .deb BUILD : Revision 589 - 2008-11-01 By: mdelfede on Sat, 01 November 2008 23:19
		SVN UPDATE & .deb BUILD : Revision 625 - 2008-11-09 By: mdelfede on Sun, 09 November 2008 10:52
		SVN UPDATE & .deb BUILD : Revision 643 - 2008-11-15 By: mdelfede on Sat, 15 November 2008 20:09
		SVN UPDATE & .deb BUILD : Revision 745 - 2009-01-14 By: mdelfede on Thu, 15 January 2009 00:14
		SVN UPDATE & .deb BUILD : Revision 868 - 2009-02-14 By: mdelfede on Sun, 15 February 2009 23:49
		SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mdelfede on Thu, 12 March 2009 23:26
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: sergeynikitin on Sun, 15 March 2009 22:45
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: andrei_natanael on Mon, 16 March 2009 10:20
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Mon, 16 March 2009 10:23
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: sergeynikitin on Tue, 17 March 2009 07:34
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Tue, 17 March 2009 08:41
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: sergeynikitin on Tue, 17 March 2009 09:04
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: sevenjay on Fri, 03 April 2009 10:52
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: sevenjay on Tue, 19 May 2009 09:08
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: tojocky on Wed, 20 May 2009 08:32
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Wed, 20 May 2009 08:45
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: tojocky on Wed, 20 May 2009 09:23
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: koldo on Wed, 20 May 2009 09:29
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: tojocky on Wed, 20 May 2009 10:49
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Wed, 20 May 2009 14:05
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: tojocky on Wed, 20 May 2009 14:31
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mr_ped on Thu, 21 May 2009 13:15
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Thu, 21 May 2009 16:35
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mr_ped on Thu, 21 May 2009 21:34
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Fri, 22 May 2009 10:28
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mr_ped on Fri, 22 May 2009 12:15
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: mirek on Fri, 22 May 2009 20:23
		Re: SVN UPDATE & .deb BUILD : Revision 951 - 2009-03-12 By: koldo on Sat, 23 May 2009 01:38

Previous Topic:	Major redesign of MT in GUI
Next Topic:	Nominate U++ for sf.net community choice awards!

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

PDF

]

Current Time: Sat May 11 07:12:32 CEST 2024

Total time taken to generate the page: 0.03029 seconds