Transfer files from Mobile to PC for free using FTP.( Without USB )

Andrew W Mandillah — Sun, 27 Aug 2023 13:11:43 +0000

You're at home or at the office and you quickly need to transfer or access files on your Mobile device from your PC.
No USB cable ? Fine . I know its 2023 , but ftp is still here to save the day !

1.Install an FTP Server App:
On your mobile device, use file Manager with support for FTP sharing eg. CX File Explorer or install an FTP server app from your app store, e.g."AndFTP" for Android or "FTPManager" for iOS.

2.Connect to the Same Wi-Fi Network:
Ensure that both your mobile device and PC are connected to the same Wi-Fi network. This step is essential for devices to communicate with each other.

3.Launch FTP Server App:
Open the FTP server app on your mobile device. Configure the app settings, including the username, password, and the folder you want to share.

4.Start FTP Server:
Start the FTP server within the mobile app. It will provide you with an FTP address (usually an IP address and port number).

5.Use FTP Client on PC:
On your PC,use the default File Manager as FTP Client or built-in command-line FTP tool or download and install an FTP client software like "FileZilla". Open the FTP client and enter the FTP address provided by the mobile app (Step 4).

6.Connect and Transfer Files:
In the FTP client, enter the username and password you set in the mobile app (Step 3). Connect to the FTP server. You'll see your mobile device's shared folder. From here, you can drag and drop files between your PC and mobile device.

Solving Merge Conflicts in Git | Conflicts between two branches on the same file [ Command Line ]

Andrew W Mandillah — Fri, 25 Aug 2023 13:00:15 +0000

While collaborating on github , and you update the same file at the same time , you have conflicts between two branches on the same file upon merge!
Let's take a scenario , where you have main branch and updated_branch and the updated_branch has remote changes on the same file as your local main branch.
TLDR;
git merge updated_branch throws an error

It's easy . Let's solve it :
1. Checkout the main branch
git checkout main
2. Merge specific files from the updated_branch :
git checkout other_branch_name -- path/to/file
Replace other_branch_name with the actual name of the other branch and path/to/file with the path to the file you want to update.
3.Commit the Changes:
git commit -m "Update file from updated_branch_name"
4.Push Changes (If Necessary):
git push origin master

Finally , try the initial merge operation.
git merge updated_branch

Voila ! Everything should be fine now !!

DEV Community: Andrew W Mandillah

Transfer files from Mobile to PC for free using FTP.( Without USB )

Solving Merge Conflicts in Git | Conflicts between two branches on the same file [ Command Line ]