Hii guys,
Scaler open source september challenge 14 overview.
1. So, for today's challenge you don't have to do anything with your github repository and cloned repository.
2. For completing today's challenge you can refer below article for better understanding.
https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
3. Make a folder in your pc and and inside that folder open git bash and run below commands.
Note : you can change contents in between " " and commits messages as per your interest. Don't just copy paste only.
4. Here's are the commands 👇
git init
echo "this is some content to mess with" > merge.txt
git add merge.txt
git commit -am "we are commiting the inital content"
git checkout -b new_branch_name
echo "totally different content" > merge.txt
git commit -am "edited the content of merge.txt"
git checkout main
echo "content to append" >> merge.txt
git commit -am "append content in merge.txt"
git merge new_branch_name
So, after running above command you will get a conflict error so for resolving above error run below commands.
git status
cat merge.txt
5. How to resolve merge conflicts using the command line?
The most direct way to resolve a merge conflict is to edit the conflicted file. Open the merge.txt file in your favorite editor. For our example lets simply remove all the conflict dividers for example symbol like this
<<<<<<
======
>>>>>>>
git add .
git commit -m "merge and resolved conflict"
git status
6. Congratulations you have just completed your Day 14 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 14 overview.
1. So, for today's challenge you don't have to do anything with your github repository and cloned repository.
2. For completing today's challenge you can refer below article for better understanding.
https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
3. Make a folder in your pc and and inside that folder open git bash and run below commands.
Note : you can change contents in between " " and commits messages as per your interest. Don't just copy paste only.
4. Here's are the commands 👇
git init
echo "this is some content to mess with" > merge.txt
git add merge.txt
git commit -am "we are commiting the inital content"
git checkout -b new_branch_name
echo "totally different content" > merge.txt
git commit -am "edited the content of merge.txt"
git checkout main
echo "content to append" >> merge.txt
git commit -am "append content in merge.txt"
git merge new_branch_name
So, after running above command you will get a conflict error so for resolving above error run below commands.
git status
cat merge.txt
5. How to resolve merge conflicts using the command line?
The most direct way to resolve a merge conflict is to edit the conflicted file. Open the merge.txt file in your favorite editor. For our example lets simply remove all the conflict dividers for example symbol like this
<<<<<<
======
>>>>>>>
git add .
git commit -m "merge and resolved conflict"
git status
6. Congratulations you have just completed your Day 14 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Atlassian
Git merge conflicts | Atlassian Git Tutorial
What is a git merge conflict? A merge conflict arises when Git cannot automatically resolve code differences between two commits. Learn more here.
👍6
How many of you completed your 1st Milestone of Scaler 30 Days Open Source Challenge?
Anonymous Poll
38%
Yes completed 🥳🥳
28%
No (some changes need to do) 😪😪
34%
Didn't receive any comments yet 😢😢
Hii guys,
If you haven't made an account on scaler.com then please make it.
Also remember fill same name, email, contact number which you filled while registering in scaler events.
Also complete your profile with profile pic, address, education, and your tshirt size.
Because whenever you order something from scaler store then moderators or admins will take whole details from your scaler account.
If you haven't made an account on scaler.com then please make it.
Also remember fill same name, email, contact number which you filled while registering in scaler events.
Also complete your profile with profile pic, address, education, and your tshirt size.
Because whenever you order something from scaler store then moderators or admins will take whole details from your scaler account.
😁3
Hii guys,
Scaler open source september challenge 15 overview.
1. First of all you have to update your all three branches by using sync and update button in your github repository.
2. So, today's task is very simple. You just need to edit and add your name in challengers_list.md file and then check your PR whether your changes visible there or not. Your name should be in below format.
[Your_Name](https://github.com/your_github_username)
3. Congratulations you have just completed your Day 15 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 15 overview.
1. First of all you have to update your all three branches by using sync and update button in your github repository.
2. So, today's task is very simple. You just need to edit and add your name in challengers_list.md file and then check your PR whether your changes visible there or not. Your name should be in below format.
[Your_Name](https://github.com/your_github_username)
3. Congratulations you have just completed your Day 15 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
👍1👎1
Hii guys,
Scaler open source september challenge 16 overview.
1. First of all you have to update your all three branches by using sync and update button on your github repository and also in your cloned repository in by using git pull.
2. So, if you see your PR today you will notice a conflict issue at the bottom of your PR.
3. We'll resolve this issue by using git in our local repository. So, shift to your name-details branch.
4. Open challengers_list.md and remove all the symbols like
<<<<<
>>>>>
=====
and save your file
4. Then add your updated file then commit then finally push it.
5. For reference I'm attaching a link of an issue in which you'll get an idea of how to solve today's challenge.
https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/111
6. Now check your PR again you'll see your issue or conflict has been resolved. So, now take screenshot of your git commands and upload it in your issue.
7. Congratulations you have just completed your Day 16 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 16 overview.
1. First of all you have to update your all three branches by using sync and update button on your github repository and also in your cloned repository in by using git pull.
2. So, if you see your PR today you will notice a conflict issue at the bottom of your PR.
3. We'll resolve this issue by using git in our local repository. So, shift to your name-details branch.
4. Open challengers_list.md and remove all the symbols like
<<<<<
>>>>>
=====
and save your file
4. Then add your updated file then commit then finally push it.
5. For reference I'm attaching a link of an issue in which you'll get an idea of how to solve today's challenge.
https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/111
6. Now check your PR again you'll see your issue or conflict has been resolved. So, now take screenshot of your git commands and upload it in your issue.
7. Congratulations you have just completed your Day 16 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
👎1
Hii guys,
Scaler open source september challenge 17 overview.
1. So, in today's challenge you don't have to do anything with your github repository or your cloned repository.
2. Today you just have to learn about how to use GitHub Desktop.
3. You can refer below article for more information.
https://docs.github.com/en/desktop/installing-and-configuring-github-desktop
4. For reference I'm attaching a link of an issue in which you'll get an idea of how to do today's challenge.
https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/46#issuecomment-1250027349
5.Congratulations you have just completed your Day 17 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 17 overview.
1. So, in today's challenge you don't have to do anything with your github repository or your cloned repository.
2. Today you just have to learn about how to use GitHub Desktop.
3. You can refer below article for more information.
https://docs.github.com/en/desktop/installing-and-configuring-github-desktop
4. For reference I'm attaching a link of an issue in which you'll get an idea of how to do today's challenge.
https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/46#issuecomment-1250027349
5.Congratulations you have just completed your Day 17 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
GitHub Docs
Installing and configuring GitHub Desktop - GitHub Docs
Get GitHub Desktop set up to manage your project work. Authenticate to GitHub.com or GitHub Enterprise, keep the app up-to-date, and review your preferred settings.
👍1👎1
Scaler coins and scaler tokens are two different things.
The actual price of mug is 500 scaler tokens and when it is converted in coins then it's price reduced at 300 scaler coins.
Check store channel and find which goodies you want to purchase.
After deciding dm to any moderator or admins then he/she give you a form to fill then only you will get goodies.
Also after the filling form it takes 2-3 weeks to goodies reach at your home. So, have patience.
Note : if you want to purchase scaler tee, mug and notebook separately then please don't purchase because after purchasing separately you will loss 1900 tokens.
So, use a trick order direct scaler goodies which will cost you only 1500 tokens and in bonus you'll get two scaler badges also.
The actual price of mug is 500 scaler tokens and when it is converted in coins then it's price reduced at 300 scaler coins.
Check store channel and find which goodies you want to purchase.
After deciding dm to any moderator or admins then he/she give you a form to fill then only you will get goodies.
Also after the filling form it takes 2-3 weeks to goodies reach at your home. So, have patience.
Note : if you want to purchase scaler tee, mug and notebook separately then please don't purchase because after purchasing separately you will loss 1900 tokens.
So, use a trick order direct scaler goodies which will cost you only 1500 tokens and in bonus you'll get two scaler badges also.
👎1
Hii guys,
Scaler open source september challenge 19 overview.
1. So, today's challenge is also very easy.
2. Firstly update your repository by using sync and update button.
3. Switch to your name-details branch and add any code file under contributors/username directory.
4. Commit the changes and push it.
5. Now check your PR whether it is passing all the checks or not. If not then write code properly in your file then push it.
6. After green tick or all checks has been passed then you are done with today's challenge.
Note : If anyone's check need approval then dm Shivay on discord for same.
7.Congratulations you have just completed your Day 19 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 19 overview.
1. So, today's challenge is also very easy.
2. Firstly update your repository by using sync and update button.
3. Switch to your name-details branch and add any code file under contributors/username directory.
4. Commit the changes and push it.
5. Now check your PR whether it is passing all the checks or not. If not then write code properly in your file then push it.
6. After green tick or all checks has been passed then you are done with today's challenge.
Note : If anyone's check need approval then dm Shivay on discord for same.
7.Congratulations you have just completed your Day 19 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
👍4👎1
Guys I have already shared the whole procedure which is required for the completion of today's challenge with @manmohan_26 so, if you have query then feel free to ask him
👍3👎2
100 Days of Code Challenge by Replit.
There is no as such goodies in this challenge but, for learning purpose you can register in this challenge.
You'll get chance to learn python from scratch to advanced level.
Also you'll be going to build 100 projects in 100 days from basic to advance level.
So, just hit below link and register yourself.
https://blog.replit.com/100-days-of-code
Happy Learning👍
There is no as such goodies in this challenge but, for learning purpose you can register in this challenge.
You'll get chance to learn python from scratch to advanced level.
Also you'll be going to build 100 projects in 100 days from basic to advance level.
So, just hit below link and register yourself.
https://blog.replit.com/100-days-of-code
Happy Learning👍
Replit Blog
Replit — Replit 100 Days of Code
We're excited to announce that today we are launching Replit's 100 Days of Code!! In just 15 minutes a day, you will build real world projects every day, totaling up to - you guessed it - 100 projects!
In this course you will learn from Replit's own master…
In this course you will learn from Replit's own master…
👍3👎1
Hii guys,
Scaler open source september challenge 21 overview.
1. So, today's challenge is also a piece of cake for us😅
2. Firstly you have to update your GitHub repo by using sync and update button then update your local cloned repo using git pull.
3. Run below commands one by one and you're done.
Note : you can modify and change the order of commands so that it's doesn't like copied.
git config --list (This should be your first command)
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status
The above commands now changes the commands format and that will ease your work while using git.
Now again run below command.
git config --list
Then use below commands to see output with your newly configured commands
git br
git st
git co your_branch_name
4. For reference you can read this article : https://www.atlassian.com/git/tutorials/git-alias
5. Now take screenshot of all your commands you had run and upload it in your issues.
6.Congratulations you have just completed your Day 21 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 21 overview.
1. So, today's challenge is also a piece of cake for us😅
2. Firstly you have to update your GitHub repo by using sync and update button then update your local cloned repo using git pull.
3. Run below commands one by one and you're done.
Note : you can modify and change the order of commands so that it's doesn't like copied.
git config --list (This should be your first command)
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status
The above commands now changes the commands format and that will ease your work while using git.
Now again run below command.
git config --list
Then use below commands to see output with your newly configured commands
git br
git st
git co your_branch_name
4. For reference you can read this article : https://www.atlassian.com/git/tutorials/git-alias
5. Now take screenshot of all your commands you had run and upload it in your issues.
6.Congratulations you have just completed your Day 21 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Atlassian
Git Alias | Atlassian Git Tutorial
Git aliases are a powerful workflow tool that create shortcuts to frequently used Git commands. Git aliases improve speed and efficiency. Learn more here.
GOOGLE CLOUD COMMUNITY DAY MEET UP IN DELHI🥳🥳
Hey fellow cloud enthusiasts!!
Hope you're as excited as we are to have you at Google Cloud Community Day Delhi 2022.
The applications are closing in 48 hours, it's your last chance to save your spot for our flagship event of the year. Register Today!!
GDG Cloud New Delhi is pumped to announce our annual flagship event "Google Cloud Community Day 2022".
We welcome all cloud, data, and AI/ML enthusiasts to this event. We bring you a stellar lineup of speakers featuring developer advocates, customer engineers and architects from Google, Google Developer Experts, and industry experts on October 2nd 2022 at The Westin Gurgaon, Delhi.
Fill out the RSVP form immediately:
https://www.commudle.com/fill-form/1434
To learn more about the event, visit :
https://www.commudle.com/communities/gdgcloudnd/events/google-cloud-community-day-2022
Perks : Free Swags, Food, Learning Opportunity, etc.
Excited to see you there!
Team
Google Developer Groups New Delhi
Hey fellow cloud enthusiasts!!
Hope you're as excited as we are to have you at Google Cloud Community Day Delhi 2022.
The applications are closing in 48 hours, it's your last chance to save your spot for our flagship event of the year. Register Today!!
GDG Cloud New Delhi is pumped to announce our annual flagship event "Google Cloud Community Day 2022".
We welcome all cloud, data, and AI/ML enthusiasts to this event. We bring you a stellar lineup of speakers featuring developer advocates, customer engineers and architects from Google, Google Developer Experts, and industry experts on October 2nd 2022 at The Westin Gurgaon, Delhi.
Fill out the RSVP form immediately:
https://www.commudle.com/fill-form/1434
To learn more about the event, visit :
https://www.commudle.com/communities/gdgcloudnd/events/google-cloud-community-day-2022
Perks : Free Swags, Food, Learning Opportunity, etc.
Excited to see you there!
Team
Google Developer Groups New Delhi
Commudle
👎2
Hii guys,
Scaler open source september challenge 23 overview.
1. So, today's challenge is very simple just go through all these 4 links and share your learning in your previous created issue in a format of summary. That's it.
https://codingsight.com/git-branching-naming-convention-best-practices/
https://tighten.com/blog/building-a-great-pull-request/
https://opensource.creativecommons.org/contributing-code/
https://youtu.be/8wt-8B9vCQg
2.Congratulations you have just completed your Day 23 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
Scaler open source september challenge 23 overview.
1. So, today's challenge is very simple just go through all these 4 links and share your learning in your previous created issue in a format of summary. That's it.
https://codingsight.com/git-branching-naming-convention-best-practices/
https://tighten.com/blog/building-a-great-pull-request/
https://opensource.creativecommons.org/contributing-code/
https://youtu.be/8wt-8B9vCQg
2.Congratulations you have just completed your Day 23 Challenge🥳🥳
If you still have any doubt then feel free to ping in group.
Also if you like this post then share with your friends and give me a thumbs up. 👍
Happy Learning
Regards
@Coding_Buddies
{coding}Sight
Git Branching Naming Convention: Best Practices - {coding}Sight
The article describes the best practices of git branch naming. View seven best naming conventions to ensure their efficiency.
👎1
Hey guys new video is out.
Watch it out if you haven't and get free swags from scaler by participating in 30 Days Of Code Challenge.
https://youtu.be/kxUCu2Hbo90
Watch it out if you haven't and get free swags from scaler by participating in 30 Days Of Code Challenge.
https://youtu.be/kxUCu2Hbo90
YouTube
Scaler 30 Days of Code Challenge | Get Free Swags & Goodies #CodingBuddies #scaler #30daysofcode
Code, But With Purpose
Coding every day is alright but how about we figure out a way to ensure you learn every day too?
Now you can! With 30 Days of Challenge, you get an opportunity to start small and go big.
📌Challenge Details : https://scalerdiscord.…
Coding every day is alright but how about we figure out a way to ensure you learn every day too?
Now you can! With 30 Days of Challenge, you get an opportunity to start small and go big.
📌Challenge Details : https://scalerdiscord.…
👎1
Hello folks,
If you receive any swags from any campaign or event and if you share your swags on any social media handle then don't forget to tag me so that I can appreciate your efforts and I'll also get chance to connect with you all.
Soon we'll hit 2k subscribers on our YouTube Channel and for that I need your support. Just share my videos with your friends and group and help me to reach more number of people.
Let's grow our community and help everyone to succeed.
If you receive any swags from any campaign or event and if you share your swags on any social media handle then don't forget to tag me so that I can appreciate your efforts and I'll also get chance to connect with you all.
Soon we'll hit 2k subscribers on our YouTube Channel and for that I need your support. Just share my videos with your friends and group and help me to reach more number of people.
Let's grow our community and help everyone to succeed.
👍5👎1
Hii guys,
The video on the topic "How to fork and create pull request" will be live at 7 PM today.
Till than you can register yourself for Hacktoberfest 2022 and share your ideas on which topic should I create issues in my repository so that it will help youe more.
Note : You are not required to be assigned on any issue. Without assigning you can also create PR. So, there is no need to ask for assigned an issue.
Happy contribution ahead👍
The video on the topic "How to fork and create pull request" will be live at 7 PM today.
Till than you can register yourself for Hacktoberfest 2022 and share your ideas on which topic should I create issues in my repository so that it will help youe more.
Note : You are not required to be assigned on any issue. Without assigning you can also create PR. So, there is no need to ask for assigned an issue.
Happy contribution ahead👍
👍5👎1