Click here to Skip to main content
15,887,596 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.

 
GeneralRe: Dinosaurs Had Covid! Pin
Gerry Schmitz10-Feb-22 11:39
mveGerry Schmitz10-Feb-22 11:39 
GeneralRe: Dinosaurs Had Covid! Pin
Duncan Edwards Jones10-Feb-22 22:52
professionalDuncan Edwards Jones10-Feb-22 22:52 
GeneralRe: Dinosaurs Had Covid! Pin
craig robbins MN11-Feb-22 1:30
craig robbins MN11-Feb-22 1:30 
JokeRe: Dinosaurs Had Covid! Pin
Daniel Pfeffer11-Feb-22 3:46
professionalDaniel Pfeffer11-Feb-22 3:46 
GeneralRe: Dinosaurs Had Covid! Pin
Fueled By Decaff11-Feb-22 2:58
Fueled By Decaff11-Feb-22 2:58 
GeneralI hate agile/scrum because... Pin
#realJSOP10-Feb-22 6:51
mve#realJSOP10-Feb-22 6:51 
GeneralRe: I hate agile/scrum because... Pin
PIEBALDconsult10-Feb-22 8:13
mvePIEBALDconsult10-Feb-22 8:13 
GeneralRe: I hate agile/scrum because... Pin
raddevus10-Feb-22 8:38
mvaraddevus10-Feb-22 8:38 
PIEBALDconsult wrote:
Branching/merging is a process smell.
In thirty years (?!) of development I haven't had to use branching/merging.


Attempting a discussion, not a rant nor anything to prove.

In a team, Branching, Merging means:

1) Production-running code is on the Main (develop, default,etc.) branch.
2) To make a change, a developer branches Main (production code), makes changes, enhancement, bug fixes --- This leaves Main (prod code) safe and sound in it's original branch.
2a) Once dev is done, code is built & handed to QA/Test
2b) Maybe QA/Test notice some things that have to be fixed in the code.
2c) Dev makes more changes (checking into branch along the way, of course) and submits to QA/Test
3) Finally the code is approved.
4) Merge the changes into Main (default, develop,) branch and deploy.

* This all means that Production code is always safe and easily retrieved from Main branch

* This means that if a dev begins doing a change and it is decided not to be used then the branch is dead & she doesn't have to pull the code out of Main (production code).

* This also means that a team of developers can work on different parts of the system at the same time (last to complete & merge to Main gets the pain though).

* Keeps things so you always have a good working copy in source control at all times.

Does this still seem like a Smell?
Just curious.
GeneralRe: I hate agile/scrum because... Pin
Greg Utas10-Feb-22 8:40
professionalGreg Utas10-Feb-22 8:40 
GeneralRe: I hate agile/scrum because... Pin
#realJSOP10-Feb-22 11:25
mve#realJSOP10-Feb-22 11:25 
GeneralRe: I hate agile/scrum because... Pin
RickZeeland10-Feb-22 8:26
mveRickZeeland10-Feb-22 8:26 
GeneralRe: I hate agile/scrum because... Pin
Slacker00710-Feb-22 8:39
professionalSlacker00710-Feb-22 8:39 
GeneralRe: I hate agile/scrum because... Pin
#realJSOP10-Feb-22 11:26
mve#realJSOP10-Feb-22 11:26 
GeneralRe: I hate agile/scrum because... Pin
dandy7211-Feb-22 6:49
dandy7211-Feb-22 6:49 
GeneralRe: I hate agile/scrum because... Pin
trønderen11-Feb-22 10:47
trønderen11-Feb-22 10:47 
GeneralRe: I hate agile/scrum because... Pin
Slacker00711-Feb-22 13:05
professionalSlacker00711-Feb-22 13:05 
GeneralRe: I hate agile/scrum because... Pin
trønderen11-Feb-22 15:35
trønderen11-Feb-22 15:35 
GeneralRe: I hate agile/scrum because... Pin
Slacker00712-Feb-22 0:27
professionalSlacker00712-Feb-22 0:27 
GeneralRe: I hate agile/scrum because... Pin
#realJSOP12-Feb-22 4:06
mve#realJSOP12-Feb-22 4:06 
GeneralRe: I hate agile/scrum because... Pin
Greg Utas10-Feb-22 8:44
professionalGreg Utas10-Feb-22 8:44 
GeneralRe: I hate agile/scrum because... Pin
#realJSOP10-Feb-22 11:26
mve#realJSOP10-Feb-22 11:26 
GeneralRe: I hate agile/scrum because... Pin
Rick York10-Feb-22 12:48
mveRick York10-Feb-22 12:48 
GeneralRe: I hate agile/scrum because... Pin
englebart10-Feb-22 9:28
professionalenglebart10-Feb-22 9:28 
GeneralRe: I hate agile/scrum because... Pin
kmoorevs10-Feb-22 10:16
kmoorevs10-Feb-22 10:16 
GeneralRe: I hate agile/scrum because... Pin
#realJSOP10-Feb-22 11:32
mve#realJSOP10-Feb-22 11:32 

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.