๐ฅ Git: Merging vs Rebasing
In git, when there are some changes in a parent branch from which you forked, there are two strategies to incorporate them into your working branch:
โจ Merging:
As the name suggests, 'merges' the parent branch into your branch. The advantage is that handling conflicts (if any) is easier, since you only need to resolve them for the merge commit once. However, this may make the git history a bit harder to follow
โจ Rebasing:
Takes all the commits you made in your branch, and applies them on top of the head of the parent branch. As if repositioning the base of the branch.
This helps to create a linear and easy to follow git history, but conflict resolution may be tedious and you need to force push the branch to the origin.
In git, when there are some changes in a parent branch from which you forked, there are two strategies to incorporate them into your working branch:
โจ Merging:
As the name suggests, 'merges' the parent branch into your branch. The advantage is that handling conflicts (if any) is easier, since you only need to resolve them for the merge commit once. However, this may make the git history a bit harder to follow
โจ Rebasing:
Takes all the commits you made in your branch, and applies them on top of the head of the parent branch. As if repositioning the base of the branch.
This helps to create a linear and easy to follow git history, but conflict resolution may be tedious and you need to force push the branch to the origin.
๐17โค6
๐
๐
Join our discussion group https://t.me/website_DesignLearning_Group
Forwarded from Web design & ๐ development
Join our new channel to learn AI tools ๐https://t.me/Aitechnologylearning
Join our new channel to learn the latest AI tools and techniques.
๐ Master powerful AI tools like ChatGPT, Midjourney, and Stable Diffusion.
๐Discover the limitless possibilities of AI and how it can enhance your creativity and productivity.
๐Explore the vast world of AI and unlock its potential to transform your life and business.
Join our channel now: https://t.me/Aitechnologylearning
Join our new channel to learn the latest AI tools and techniques.
๐ Master powerful AI tools like ChatGPT, Midjourney, and Stable Diffusion.
๐Discover the limitless possibilities of AI and how it can enhance your creativity and productivity.
๐Explore the vast world of AI and unlock its potential to transform your life and business.
Join our channel now: https://t.me/Aitechnologylearning
๐5โค1
๐จ Looking for the Best Resources for Front End Design? โค๏ธ
๐ Color Sites:
1. colorhunt.co
2. klart.io
3. color.adobe.com
4. webkul.github.io
5. pigment.shapefactory.co
๐ป Sites To Download Fonts:
1. dafont.com
2. 1001fonts.com
3. fontsquirrel.com
4. fontfreak.com/fonts-new.htm
๐ผ Sites To Download Vector Logos:
1. seeklogo.com
2. logovector.net
3. logotypes101.com
4. logos-vector.com
๐ต Sites To Download Icons:
1. flaticon.com
2. freeicons.io
3. iconstore.co
4. iconfinder.com
5. digitalnomadicons.com
6. iconstore.co
๐ Brushes Download Sites:
1. brushking.eu
2. brusheezy.com/brushes
3. myphotoshopbrushes.com
4. fbrushes.com
5. gfxfever.com
๐ Sites To Download Files:
1. freepik.com
2. all-free-download.com
3. vecteezy.com
4. freeimages.com
๐ธ Sites To Download Mockups:
1. mockupsforfree.com
2. mockupworld.co
3. graphicburger.com
4. zippypixels.com
โจ Inspiration Sites:
1. inspirationde.com
2. designspiration.net
3. pinterest.com
4. dribbble.com
๐ฅ Video Sites:
1. mixkit.co
2. coverr.co
3. motionplaces.com
4. videezy.com
๐ผ Photo Sites Without Background:
1. cleanpng.com
2. pngimg.com
3. footyrenders.com
4. pngtree.com
๐ท Photo Sites:
1. unsplash.com
2. pexels.com
3. pixabay.com
4. stocksnap.io
5. burst.shopify.com.
Explore these Incredible Resources and take your Front End UI/UX Projects to the next level.
๐ Color Sites:
1. colorhunt.co
2. klart.io
3. color.adobe.com
4. webkul.github.io
5. pigment.shapefactory.co
๐ป Sites To Download Fonts:
1. dafont.com
2. 1001fonts.com
3. fontsquirrel.com
4. fontfreak.com/fonts-new.htm
๐ผ Sites To Download Vector Logos:
1. seeklogo.com
2. logovector.net
3. logotypes101.com
4. logos-vector.com
๐ต Sites To Download Icons:
1. flaticon.com
2. freeicons.io
3. iconstore.co
4. iconfinder.com
5. digitalnomadicons.com
6. iconstore.co
๐ Brushes Download Sites:
1. brushking.eu
2. brusheezy.com/brushes
3. myphotoshopbrushes.com
4. fbrushes.com
5. gfxfever.com
๐ Sites To Download Files:
1. freepik.com
2. all-free-download.com
3. vecteezy.com
4. freeimages.com
๐ธ Sites To Download Mockups:
1. mockupsforfree.com
2. mockupworld.co
3. graphicburger.com
4. zippypixels.com
โจ Inspiration Sites:
1. inspirationde.com
2. designspiration.net
3. pinterest.com
4. dribbble.com
๐ฅ Video Sites:
1. mixkit.co
2. coverr.co
3. motionplaces.com
4. videezy.com
๐ผ Photo Sites Without Background:
1. cleanpng.com
2. pngimg.com
3. footyrenders.com
4. pngtree.com
๐ท Photo Sites:
1. unsplash.com
2. pexels.com
3. pixabay.com
4. stocksnap.io
5. burst.shopify.com.
Explore these Incredible Resources and take your Front End UI/UX Projects to the next level.
Fontfreak
Font Freak - New Fonts page 1
Font Freak - New Fonts page 1 Download free fonts. Thousands of true type fonts and dingbats for PC and Mac. Bestina, Theola Kids, Delumba, Wonderia, LearnShareColaborate-BoldItalic, Sottee, Prettyla, Thisay
๐43โค16๐ฅ2๐1
๐ด Join discussion group ๐
https://t.me/website_DesignLearning_Group
https://t.me/website_DesignLearning_Group
๐9โค4๐1
โค๏ธLet us know what type of content are you looking for??
๐4โค2๐1
๐๐20 passive income ideas for web developers ๐๐
Create a WordPress plugin and sell it on the WordPress Plugin Repository.
Build a web application and charge a subscription fee for access.
Develop and sell website templates on platforms like ThemeForest.
Write an eBook on web development and sell it on platforms like Amazon Kindle.
Create a course on web development and sell it on platforms like Udemy or Coursera.
Develop a web-based tool or app and charge a subscription fee for access.
Build a premium version of a free plugin or theme and sell it on your own website.
Create a premium version of a free web application or tool and sell it on your own website.
Develop and sell a custom WordPress theme to clients.
Create a membership site that provides access to exclusive web development resources.
Build a SaaS (Software as a Service) product and charge a monthly subscription fee.
Develop and sell mobile apps for iOS or Android.
Create and sell digital products like stock images or graphics on platforms like Creative Market.
Build a community site and charge a membership fee for access.
Offer premium support or consulting services to clients who purchase your products.
Develop and sell a website hosting service.
Create and sell a website monitoring tool.
Develop and sell a website security service.
Create and sell a website backup and recovery service.
Offer a website maintenance service to clients who want to outsource their website management.
๐๐20 passive income ideas for web developers ๐๐
Join on telegram
https://t.me/WebsiteDesignLearningGroup
Create a WordPress plugin and sell it on the WordPress Plugin Repository.
Build a web application and charge a subscription fee for access.
Develop and sell website templates on platforms like ThemeForest.
Write an eBook on web development and sell it on platforms like Amazon Kindle.
Create a course on web development and sell it on platforms like Udemy or Coursera.
Develop a web-based tool or app and charge a subscription fee for access.
Build a premium version of a free plugin or theme and sell it on your own website.
Create a premium version of a free web application or tool and sell it on your own website.
Develop and sell a custom WordPress theme to clients.
Create a membership site that provides access to exclusive web development resources.
Build a SaaS (Software as a Service) product and charge a monthly subscription fee.
Develop and sell mobile apps for iOS or Android.
Create and sell digital products like stock images or graphics on platforms like Creative Market.
Build a community site and charge a membership fee for access.
Offer premium support or consulting services to clients who purchase your products.
Develop and sell a website hosting service.
Create and sell a website monitoring tool.
Develop and sell a website security service.
Create and sell a website backup and recovery service.
Offer a website maintenance service to clients who want to outsource their website management.
๐๐20 passive income ideas for web developers ๐๐
Join on telegram
https://t.me/WebsiteDesignLearningGroup
๐18โค11๐ฅ2