git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Git Branching - Best Practices - Large project - long running branches

From
MJMayne, Joe <jmayne@lsac.org>
Date
Mar 31, 2017, 11:55 UTC
Message-ID
<4bb4871d8a78402bbef91231134a613b@EX1-PRD.lsac.org>

Hello, I work on a team of 15+ developers. We are trying to determine best practices for branching because we have had code stepped on when a developer has a long running feature branch.

We have a Development branch. Developers are instructed to create a branch when they begin working on a feature. Sometimes a feature may take a week or two to complete. So a Developer1 creates a branch and works for a week or two. In the meantime, other developers have created feature branches from Development and merged them back into Development. 
At this point we are not certain if Developer1 should: 
* Periodically merge the evolving Origin/Development into their Feature branch and when they are done work merge their feature branch into Origin/Development. 
OR 
* Stay on their pure feature branch and when they are done merge into Origin/Development. 
We have had issues with developers stepping on code when they have long running branches. We are looking for a best practices. 

Thank you, Joe Mayne

Next: Jakub Narębski
Message 1 of 3 in “Git Branching - Best Practices - Large project - long running branches”
  1. Mayne, JoeMar 31, 2017
  2. Jakub NarębskiMar 31, 2017
  3. Randall S. BeckerMar 31, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.