prateeksawhney97 / merge-conflict

Managing merge conflicts

Indian Share Split App: Transfer files, photos, videos & apps to other devices.

Google Playstore - https://play.google.com/store/apps/details?id=net.sharesplit.android.android

Share Split app enables quick and easy file transfer without internet usage. Share Split app created by Prateek Sawhney is a better and easy to use sharing app with fast and stable transfer speeds. Share any kind of files including apps, games, obb files, photos, videos in a fast and efficient way. Share Split makes it easy to send files and apps to other devices in local network. Enjoy 100% seamless transfer of files and apps across various devices!

Share Split - Made in India	100% seamless transfer	Share Apps	DistincTrait

Transfer and Share in a few clicks ->

⭐ Share videos, music, photos, documents, obb files via android phones.

⭐ Ability to share multiple folders and large files with one single click.

⭐ Complete ad free experience and hassle free automatic fast transfer of apps and files.

⭐ Absolutely without any mobile data usage. No need to turn Internet off. One can use mobile data in between large transfers. Mobile data usage does not affect the transfer speed.

⭐ No need to turn your internet off! Yes, you read it right. With Share Split, data and apps can be sent smoothly across different platforms along with the usage of WiFi.

⭐ Send files and apps with Share Split from other android applications like Gallery, Google Docs and Google Photos.

⭐ Instant large file transfers and app transfers in the form of apk. Device apps are transferred in the form of apk. Send apk of the installed applications to other devices with the use of Share Split.

⭐ Option to become hidden in the local network.

⭐ Share history shows all the transfers performed including apps and files.

⭐ Indian Sharing Application - Made with ❤ in India

Why Share Split App?

⚡ Bulk Transfer Large Files

Look no further than Share Split when you need to transfer massive folders. You can share multiple large files and folders with one click!

⚡ Transfer files with flash speed

Send and receive any type of files, apps, music, games, obb files, documents, pdf's and more in no time. Transfer 200 times faster than Bluetooth.

⚡ No Ads

Enjoy a completely Ad free experience with no disruptions when sharing files. Receive files without any limitations. Receive contacts, apps, images, videos, music, documents, etc. easily.

⚡ No Loss in Quality

Send large files without any limitations and maintain the original file size. Send as much as you can with no loss in quality.

⚡ Only Storage Permission

In order to send and receive files, Share Split needs only the permission to read and write files on your Android device or the Storage Permission.

-- Want to show love and help Share Split grow? A positive rating would definitely encourage me to offer you the best experience and service.

-- Your feedback is important to me ❤

[Support] In case of any query, feel free to contact on: [email protected]

Hi there 👋

• 🔭 I’m currently working as an Explore Machine Learning Facilitator @ Google, India
• 🌱 I’m currently learning Data Science
• 👯 I’m looking to collaborate on Data Science and Machine Learning Projects
• 💬 Ask me about Ethereum Blockchain, Deep Learning and Computer Vision
• 📫 Connect with me on Linkedin: https://www.linkedin.com/in/prateek-sawhney-a0b134131/

merge-conflict's Issues

Welcome

Welcome to Managing Merge Conflicts 🎉

Hello, and welcome! If you're here to learn about and practice resolving merge conflicts, you're in the right place.

In this course, you'll learn why merge conflits happen by solving four merge conflicts. All of the merge conflicts in this course will be simple enough to solve from within the GitHub.com user interface, but if you'd prefer, you can solve them using the command line or other local tools.

As an added bonus, the project we are using for this course is a resume hosted on GitHub Pages! So, if you want to keep working after you complete this course, please feel free!

Note: You may notice that some branches and pull requests already exist. We'll be using them in later activities in this course.

How merge conflicts happen

Version control lets you make incremental changes to your code or file base while keeping the history. Git operates as a linked list, so a small history of three commits ^📖 might look like this:

In the GitHub Flow, you...

• first create a new branch ^📖 off of the base branch, which is really just a reference point to a commit on the base branch.

• Next, you add one or more commits that, for now, exist only on your branch. The other commits stay fixed to their reference point in history.

• Finally, you open a pull request ^📖 to propose that your new commits be included in the base branch, optionally add more commits, and then merge ^📖 and delete your branch!

A Merge conflict occurs when someone else made a change on the base branch in the same file and location where you proposed changes. This usually happens when someone else merges in their branch before you merge yours.

This can be intimidating, but have no fear, Git knows how to handle this! It only needs a human to decide how to resolve the conflict.

Step 1: Create a Pull Request

Before we get too far ahead of ourselves, let's first practice making a simple change on a branch. Visualize your actions using the flow you reviewed above.

⌨️ Activity: Create a normal pull request

1. On the Code tab, click the _data/skills.yml file
2. In the upper right corner of the file view, click the ✏️ icon to open the file editor
3. In the file, add a skill or two that you're proficient in
4. Scroll to the bottom of the page and select the option to "Create a new branch for this commit and start a pull request"
5. Replace the default patch branch name with change-skills
6. Select Propose file change
7. In the "Leave a comment" field of the pull request, describe the change you made
8. Click Create pull request
9. 🚧 Don't merge yet! 🚧 Refresh the pull request to receive the next comment/instructions.

For a printable version of the steps in this course, check out the Quick Reference Guide.

---

Look for my next response in your pull request

Sometimes I respond too fast for the page to update! If you perform an expected action and don't see a response from me, wait a few seconds and refresh the page for your next steps.

Next steps

Nice work

Congratulations @prateeksawhney97, you've completed this course!

What went well

Before I say good-bye, here's a recap of all the tasks you've accomplished in your repository:

• You learned why merge conflicts happen
• You practiced a normal merge
• You resolved a simple merge conflict
• You created a merge conflict, and resolved it!
• You resolved a multi-file merge conflict

What's next?

Here are some instructions you can use to keep working on your resumé:

Finishing the resume

---

Finishing the resume

To modify the other sections of the resume, simply create a new branch and modify the files found in the _data folder.

For example, to modify the "Projects" section, edit the _data/projects.yml file. After making your changes, create a new pull request and merge your changes.

---

Changing the picture

---

Changing the picture

If you would like to change the image used on your resume, you need to make a few changes to the files.

1. Create a new branch, maybe name it something like new-avatar.
2. Navigate to the images directory and click the Upload files button.
3. Drag and drop your image.
4. Commit your change by clicking Commit changes.
5. On the new-avatar branch, open the _layouts/resume.html file and edit line 16. Replace images/bob-avatar.jpg with images/YOURFILENAME.
6. Create a pull request.
7. Merge the pull request, and delete the branch.

---

Enabling GitHub Pages

---

Enabling GitHub Pages

When you are happy with your resume, you will need to publish it with GitHub Pages. This resume is ready for GitHub Pages, you just need to turn it on. Follow these steps to enable GitHub Pages when you are ready to officially publish your resume:

1. Click on the Settings tab.
2. Scroll to the "GitHub Pages" section.
3. In the "Source" drop-down, select master branch.
4. Click Save.
5. 🚧 Warning! 🚧 Make sure you don't see any errors after you select save. If you do, your page won't build correctly and this step will be incomplete.

Your GitHub Pages resumé site will be live very shortly. Click here to check it out.

---

Keep Learning

Want to work on resolving merge conflicts using the command line? Check out this documentation.

Want to keep learning? Feel free to check out our other courses?

---

I won't respond to this issue, go ahead and close it when finished!