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

Really beginner on Version Control

From
FernandoBasso <fernandobasso.br@gmail.com>
Date
Sep 21, 2010, 14:42 UTC
Message-ID
<1285080133451-5555023.post@n2.nabble.com>
I am really a beginner in. Bear with me please.

Why do we merge, say a testing branch into the master branch ? What is the use of it ?

When there is a conflict when merging branches (merging the testing into the current branch), should I edit the 'current' branch or the 'testing' branch ?

Should both branches have exactly the same code so that they can be merged without conflicts ?

-- 
View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5555023.html
Sent from the git mailing list archive at Nabble.com.
Next: Thomas Moulard
Message 1 of 17 in “Really beginner on Version Control”
  1. FernandoBassoSep 21, 2010
  2. Thomas MoulardSep 21, 2010
  3. Enrico WeigeltSep 21, 2010
  4. Eric RaibleSep 24, 2010
  5. Enrico WeigeltSep 24, 2010
  6. FernandoBassoSep 24, 2010
  7. Andreas EricssonSep 21, 2010
  8. Jakub NarebskiSep 21, 2010
  9. FernandoBassoSep 22, 2010
  10. Andrew KellerSep 22, 2010
  11. FernandoBassoSep 22, 2010
  12. FernandoBassoSep 22, 2010
  13. Tor ArntsenSep 22, 2010
  14. Dmitry PotapovSep 22, 2010
  15. Thomas HochsteinSep 22, 2010
  16. Dmitry PotapovSep 22, 2010
  17. Dmitry PotapovSep 22, 2010

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.