Idea-Pool / topics

This repository is for the management of the Idea Pool topics and connected resources, such as our Value Stream.
1 stars 0 forks source link

[Idea]: Git merging: Squash, Rebase vs Merge #21

Open szikszail opened 1 year ago

szikszail commented 1 year ago

1.1. Title

Git merging: Squash, Rebase vs Merge

1.2. Details

The goal of this topic is to create a guide to understand the differences, pros, and cons of the different merging strategies and methods (e.g. from GitHub):

  1. Squash
  2. Rebase
  3. Merge

Additional information

2.1. Area

Software Development

3.1. Stream

Competency Development (assisting engineer to grow professionally)

4.1. Format

Article (covering the idea in a written format), Webinar (covering the idea in an online event to teach, share experience and best practices)

5.1. Artifact

Article (an article on the Idea Pool WeAreCommunity page), Talk (a talk on the Idea Pool WeAreCommunity page), Video (a recording or a manually constructed/edited video)