| Author | Message | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42570 Registered: 02-2009 Posted From: 64.102.249.10 Rating: N/A |
/* same code lines ithe koddiga pani paduddi neeku */ saint ji .. can u list in 2-3 lines about that 'koddiga pani' my understanding is after release, need to manually open latest code from release about what conflicts are there. work on those conflicts .. test and then proceed ... anything else ? Jai Rayala Seema ! | ||
Saint Legend Username: Saint Post Number: 67063 Registered: 01-2011 Posted From: 144.230.63.53 Rating: N/A |
SVN update and fix the conflicts..if u both on 2 different pieces of code at different places..it shouldnt be an issue..u can simply merge it...same code lines ithe koddiga pani paduddi neeku | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42569 Registered: 02-2009 Posted From: 64.102.249.10 Rating: N/A |
aha and budugu .. thanks for clarifying .. I am learning so pls spare my ignorance .. Jai Rayala Seema ! | ||
Aha Side Hero Username: Aha Post Number: 4353 Registered: 01-2011 Posted From: 170.136.110.10 Rating: N/A |
Looks like, ikkada 2 working out of the same branch, Instead of creating their own branches from the trunk. The One and Only Veturi | ||
Aha Side Hero Username: Aha Post Number: 4352 Registered: 01-2011 Posted From: 170.136.110.10 Rating: |
Are you using SVN? If so, since srini already checked in his changes,before you check in your code, update your working branch to latest from SVN and then commit your changes. The One and Only Veturi | ||
Buduguuu Megastar Username: Buduguuu Post Number: 26687 Registered: 01-2012 Posted From: 192.193.216.150 Rating: N/A |
asala why would you merge your changes to main without a release completing? everybody will be working on the same branch kada? when you check in, code diff lo you will obviously see that srinivas changes are not in your file kada. or ala kakunda meeru change chesetappudu oka release ayipote you are supposed to move to new branch created from main right after release and start checking in your changes to this new branch kada.. what am i missing here? | ||
Rasputin Megastar Username: Rasputin Post Number: 21023 Registered: 02-2008 Posted From: 172.56.3.142 Rating: N/A |
Yes Bithiri cheppindi good practice. Konni tools lo auto merge features untaayi, but it is always better to follow the described practice 01/06/2012 - 169.4; 8/1/2013 - 182; 9/23/2016 - 185.8 | ||
Rasputin Megastar Username: Rasputin Post Number: 21022 Registered: 02-2008 Posted From: 172.56.3.142 Rating: N/A |
lol ala anesaavu enti. Ila okari taruvatha inkokaru cheyyalantey kudaradu complex projects lo. Not sure what you are using, but it is a good practice to update/merge your local branch with main/trunk's head before you page/commit your change. Same area of code ayithey, resolve the conflicts and then commit 01/06/2012 - 169.4; 8/1/2013 - 182; 9/23/2016 - 185.8 | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42568 Registered: 02-2009 Posted From: 64.102.249.6 Rating: N/A |
thanks bithiri ji for the pic .. Jai Rayala Seema ! | ||
Bithiri_bathi Junior Artist Username: Bithiri_bathi Post Number: 988 Registered: 04-2016 Posted From: 144.49.131.1 Rating: N/A |
not sure which subversion tool you are using...but the idea is always get latest changes from main to whatever branch you are working and then test your changes and merge it back refer to this diagram http://imgur.com/a/O3vfS | ||
Sasibabu Legend Username: Sasibabu Post Number: 47457 Registered: 11-2009 Posted From: 45.20.143.145 Rating: N/A |
BTW Srinivas evitlu? ani sesani asking | ||
Gatti_gunde Megastar Username: Gatti_gunde Post Number: 21471 Registered: 02-2010 Posted From: 204.194.77.3 Rating: N/A |
svn aaa ?? Boob annai ni kindhesi thanthe DB set aithadhi | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42566 Registered: 02-2009 Posted From: 64.102.249.6 Rating: N/A |
bithiri bhai .. thanks .. so as per your guidance it is like this .. i make my changes to my branch but just before putting into main, i again need to checkout from main .. make my changes again test it and then merge into main ? Jai Rayala Seema ! | ||
Sasibabu Legend Username: Sasibabu Post Number: 47456 Registered: 11-2009 Posted From: 45.20.143.145 Rating: N/A |
you should communicate with srinivas and do one after one .... anthegani ...same dhaanini idharu fingering chesi main lo vundalante etta | ||
Mental_sachinodu Hero Username: Mental_sachinodu Post Number: 19393 Registered: 10-2008 Posted From: 24.125.46.70 Rating: N/A |
idharu same branch lo worked, kadha, merge your colleague's changes from the branch with your version, and then merge upstream to the main | ||
Bithiri_bathi Junior Artist Username: Bithiri_bathi Post Number: 986 Registered: 04-2016 Posted From: 144.49.131.1 Rating: N/A |
You need to merge from 'main' (which has Srinivas changes) to your local branch and then push the changes basically: fetch all the latest changes from 'main' or 'master' to your local branch before merging it back to 'main' | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42565 Registered: 02-2009 Posted From: 64.102.249.6 Rating: N/A |
i checked out a branch ... making changes to procedure B my colleague Srinivas too checked out same branch .. made changes to same procedure B and merged code into main .. now 7 days later , i would be trying to merge my code into main .. my doubt is .. my code wont have Srinivas' changes ... so how is this situation handled ? Jai Rayala Seema ! | ||
Bithiri_bathi Junior Artist Username: Bithiri_bathi Post Number: 985 Registered: 04-2016 Posted From: 144.49.131.1 Rating: N/A |
git use chesthunnara? | ||
Pulpfiction Legend Username: Pulpfiction Post Number: 42564 Registered: 02-2009 Posted From: 64.102.249.6 Rating: N/A |
Code Branching Doubt ... please help .. thanks in advance .. Jai Rayala Seema ! |
