Regarding maintaining the parent child relationship of the branches

[karan-noborders]

Select Topic Area

Question

Body

I want to know that whether it is important to maintain the parent child relationship between the branches while pushing and merging the code. Or we can merge with any of the branch irrespective of the parent.
Does both the approaches has any advantages or disadvantages ?

[maahaMaya]

Points to Remember.

1. main branch is the root(parent).
2. Create a new Branch AAA and AAA merge and push to main.
3. Create a new Branch BBB and BBB merge and push to main.
   *** If you want to AAA merge with main there is conflict ***
   So, remember always merge last branch to main ** if you merge BBB to main there is no conflict**

You can follow this tutorial. They explain all the things in very good manner.

[karan-noborders]

https://drive.google.com/file/d/1pyvfxhJuxO7MPl_P3lF9wHWa1CrKe-rU/view?usp=sharing
Here i have attached an image and the branch hierarchy is given as follows.

Is it correct way to merge F with D and push to C and then push to A ?

[maahaMaya]

you cannot merge F and D because they not connected by any relation.

[karan-noborders]

Can you share some link to get more information on it ? @maahaMaya

[karan-noborders]

Can you share please.

[maahaMaya]

https://www.youtube.com/playlist?list=PLDEgqz_Jsm9hNr1T6F7mBgAMoV6Jshp0I

you can follow playlist.
They explain all the thing in details.

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬