Click here to Skip to main content
15,944,959 members

Welcome to the Lounge

   

For discussing anything related to a software developer's life but is not for programming questions. Got a programming question?

The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.

 
RantAre there good techniques when manually merging code ? Pin
Maximilien21-May-24 8:50
Maximilien21-May-24 8:50 
GeneralRe: Are there good techniques when manually merging code ? PinPopular
Roger Wright21-May-24 9:04
professionalRoger Wright21-May-24 9:04 
GeneralRe: Are there good techniques when manually merging code ? Pin
0x01AA21-May-24 9:24
mve0x01AA21-May-24 9:24 
GeneralRe: Are there good techniques when manually merging code ? PinPopular
Pete O'Hanlon21-May-24 9:46
mvePete O'Hanlon21-May-24 9:46 
GeneralRe: Are there good techniques when manually merging code ? Pin
Daniel Pfeffer21-May-24 10:36
professionalDaniel Pfeffer21-May-24 10:36 
GeneralRe: Are there good techniques when manually merging code ? PinPopular
Jeremy Falcon21-May-24 11:59
professionalJeremy Falcon21-May-24 11:59 
GeneralRe: Are there good techniques when manually merging code ? Pin
charlieg21-May-24 12:20
charlieg21-May-24 12:20 
GeneralRe: Are there good techniques when manually merging code ? Pin
Jeremy Falcon22-May-24 2:58
professionalJeremy Falcon22-May-24 2:58 
Funny, I mentioned BC and no upvotes for me. Starting to think the people of this place aren't mature and rational. Laugh | :laugh: Laugh | :laugh: Laugh | :laugh:

Oh and thumbs up for mentioning BC.
Jeremy Falcon

JokeRe: Are there good techniques when manually merging code ? Pin
Daniel Pfeffer22-May-24 3:45
professionalDaniel Pfeffer22-May-24 3:45 
GeneralRe: Are there good techniques when manually merging code ? Pin
Jeremy Falcon22-May-24 4:04
professionalJeremy Falcon22-May-24 4:04 
GeneralRe: Are there good techniques when manually merging code ? Pin
Nelek22-May-24 6:34
protectorNelek22-May-24 6:34 
GeneralRe: Are there good techniques when manually merging code ? Pin
ShawnVN22-May-24 7:50
ShawnVN22-May-24 7:50 
GeneralRe: Are there good techniques when manually merging code ? Pin
charlieg22-May-24 8:02
charlieg22-May-24 8:02 
GeneralRe: Are there good techniques when manually merging code ? Pin
jschell21-May-24 12:33
jschell21-May-24 12:33 
GeneralRe: Are there good techniques when manually merging code ? Pin
charlieg21-May-24 23:14
charlieg21-May-24 23:14 
GeneralRe: Are there good techniques when manually merging code ? Pin
StarNamer@work22-May-24 3:31
professionalStarNamer@work22-May-24 3:31 
GeneralRe: Are there good techniques when manually merging code ? Pin
charlieg22-May-24 8:03
charlieg22-May-24 8:03 
GeneralRe: Are there good techniques when manually merging code ? Pin
jschell23-May-24 13:13
jschell23-May-24 13:13 
GeneralRe: Are there good techniques when manually merging code ? Pin
Nelek22-May-24 6:35
protectorNelek22-May-24 6:35 
GeneralRe: Are there good techniques when manually merging code ? Pin
Jef fJacobson22-May-24 7:15
Jef fJacobson22-May-24 7:15 
GeneralRe: Are there good techniques when manually merging code ? Pin
ShawnVN22-May-24 10:12
ShawnVN22-May-24 10:12 
GeneralRe: Are there good techniques when manually merging code ? Pin
MSBassSinger23-May-24 3:11
professionalMSBassSinger23-May-24 3:11 
GeneralThis just happened at lunch. Pin
raddevus21-May-24 7:58
mvaraddevus21-May-24 7:58 
GeneralRe: This just happened at lunch. Pin
Dave Kreskowiak21-May-24 10:11
mveDave Kreskowiak21-May-24 10:11 
GeneralRe: This just happened at lunch. Pin
Peter_in_278021-May-24 12:25
professionalPeter_in_278021-May-24 12:25 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.