best practices: merge by topics

Merge By TopicsBest Practices

1

There is no naming convention

2

Current Situation

Current Situation

3

It’s not possible to merge by topics easily

4

• Changesets of New Features on Dev branchFormat: [F<Feature ID>][US<User Story ID>][T<Task ID>] – <User Comments>

• Bug fixes related to a Feature on Dev branchFormat: [F<Feature ID>][US<User Story ID>][B<Bug ID>] – <User Comments>

Example : [F75387][US75500][B76709] – User created in the Registration confirmation screen

• Bug fixes from ProductionFormat: [B<Bug ID>] - <User Comments>

Naming Convention - Check In

Naming Convention - Merge

• Merges by Features from Dev to IntFormat: [F<Feature ID>][US<User Story ID>]Merge Dev -> Int

Example : [F75387][US75500]Merge Dev -> Int

• Merges by Features from Int to ProdFormat:[F<Feature ID>][US<User Story ID>]Merge Int -> Prod

Example : [F75387][US75500]Merge Int-> Prod

5

When Merge ?

6

• Merges should be done by Feature or User Story from Dev -> Int

• Merge from Dev -> Int should be done 1. by the Developer responsible of this Feature or User Story2. when it is complete3. across all Projects it affects. (ex. Development in Poker.Front, Script in

Database, Development in BackOffice)

• Merges from Int -> Prod can be done by Feature or User Story as reviewed with QA.

Find out more

• On https://techblog.betclicgroup.com/

7

About Betclic• Betclic Everest Group, one of the world leaders in online gaming, has a unique portfolio

comprising various complementary international brands: Betclic, Everest Gaming, bet-at-home.com, Expekt…

• Active in 100 countries with more than 12 million customers worldwide, the Group is committed to promoting secure and responsible gaming and is a member of several international professional associations including the EGBA (European Gaming and Betting Association) and the ESSA (European Sports Security Association).

• Through our brands, Betclic Everest Group places expertise, technological know-how and security at the heart of our strategy to deliver an on-line gaming offer attuned to the passion of our players.

8

We are hiring!

Betclic Everest, Bet on the best... job!

We’re helping millions of on-line players express their passion for Sport, Poker, Casino, Horse Racing...

We want our brands to be easy to use for every gamer around the world. We’re building our company to make that happen.

Everything we do should reflect our values: Come and work in a friendly atmosphere based on trust & cooperation between IT Teams.

So bet on the best job & join our teams!

9