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

Re: Really beginner on Version Control

From
FernandoBasso <fernandobasso.br@gmail.com>
Date
Sep 22, 2010, 11:49 UTC
Message-ID
<1285156189754-5558706.post@n2.nabble.com>
In-Reply-To
<1285155943433-5558696.post@n2.nabble.com>
On 09/22/2010 04:35 AM, Thomas Hochstein [via git] wrote:
Show 7 quoted lines
>
> You have changed "hello" to world in your testing branch. When you
> merge your testing branch back to your master branch, git will apply
> all changes you made in testing to master. That's not a problem in
> that case, as master was not changed since testing was branched from
> it.
>

Okay. So, If I have not changed master since I last edited testing, I can merge testing into master without problem.

I merge testing into master (without problems) and I change master and merge testing into master again (without any further modification). Now, git thinks that the changes I've just made in master are more important than the old changes in testing ?

-- 
View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5558706.html
Sent from the git mailing list archive at Nabble.com.
Previous: FernandoBassoNext: Tor Arntsen
Message 12 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.