• Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Jeanne Boyarsky
  • Ron McLeod
  • Paul Clapham
  • Liutauras Vilda
Sheriffs:
  • paul wheaton
  • Rob Spoor
  • Devaka Cooray
Saloon Keepers:
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Frits Walraven
  • Tim Moores
Bartenders:
  • Mikalai Zaikin

Git: Merge - What could a beginner learn?

 
Ranch Hand
Posts: 49
Firefox Browser Java Windows
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Hi Marco,

Congrats on the book. I'm currently a beginner with git, just pulling and pushing without much thought about the rest of it. I was wondering what knowledge I could learn from your book. Thanks!
 
Author
Posts: 141
6
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Frankly, my guide (it's more of a guide, than a full blown book) is more geared towards intermediates, who already have some practice with merging, rebasing, cherry-picking and want to understand what they're actually doing and avoid the most common problems with those 3 that people have on a daily basis.

Still, I'd be interested to see what a complete Git beginner might make out of the guide, always interested in such feedback
 
Sheriff
Posts: 17652
300
Mac Android IntelliJ IDE Eclipse IDE Spring Debian Java Ubuntu Linux
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator

Marco Behler wrote:merging, rebasing, cherry-picking and want to understand what they're actually doing and avoid the most common problems with those 3 that people have on a daily basis.


Maybe it would be useful if you could list down some of those problems you address in the book. In what situations would your book prove useful?

What is available on your book's site looks very detailed and at least one level (of abstraction) down, a great way to get a good understanding of any tool you use.
 
Marco Behler
Author
Posts: 141
6
  • Likes 1
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Hey  Junilu,
it's basically what I list at the beginning of the guide, i.e. scenarios like the following:



But did you ever botch a merge and then your solution was to delete and re-clone your repository? Without quite knowing what went wrong and why?

Or did a rebase suddenly make tens of merge conflicts pop up, one after another and you didn’t know what the hell was going on?

In short, do you have nagging doubts, whenever it comes to merging, rebasing and cherry-picking?



Hope that makes sense.
 
Don't count your weasels before they've popped. And now for a mulberry bush related tiny ad:
a bit of art, as a gift, that will fit in a stocking
https://gardener-gift.com
reply
    Bookmark Topic Watch Topic
  • New Topic