Sync Forked Repository With Upstream 🔁✔️

-
Here's the situation, You have forked a repository on GitHub, you have made your changes and sent a pull request and that request has been merged. 

Now you want to make further changes, but the repository mentions that you are X commits ahead or/and X commits behind upstream repository.

So how do you sync it?
You can delete your fork and fork the original repository again, but that is a very tedious thing to do.

Here's another way to do this:

1. Clone your fork
git clone https://github.com/yourname/repo.git
cd yourname/repo
2. Add upstream remote
git remote add upstream https://github.com/original-author/repo.git
git fetch upstream
3. Ignore all changes in fork and sync with upstream
git reset --hard upstream/master
git push -f origin master
Only do this if you have no changes on your fork that you will like to keep.
This will set your fork's master to be the same as upstream's master.
Now you are free to make any changes you wish to make.

If you just want to get the changes from upstream you can do
git pull upstream master 
git push origin master
Just a word of caution: Always be extra careful when using the -f or --force option.

Thank you for reading, hope you found this useful, see you in the next one.

Comments

Post a Comment

Popular posts from this blog

Remove Screen Flickering OBS 💻📹

-
I was recently trying out OBS for my new YouTube Channel ! but faced weird flickering issues when recording, after a lot of tweaking I found the solution.  You have to turn of Vsync on your system. On KDE the steps are as follows: Open System Settings Then go to Display and Monitor section Click on Compositor Here, change Tearing Prevention (vsync) to Never This should do the trick. Try again and you shouldn't face flickering issues anymore.
Read more

Control Your Android Device From PC 📱💻

-
Image
scrcpy running on Linux Wouldn't it be convenient if you could mirror your Android device's screen onto your PC and interact with it? I have just the right tool for this job that lets you do all this and more and it's called "scrcpy". It is a tool created by folks at Genymotion. What you'll need: Android device with Lollipop (API 21 / Android 5.0) or newer with USB debugging turned on. adb - Android debugging bridge. scrcpy itself. Installation instructions: Windows: You can get the pre built release which includes both adb and scrcpy from  here . Linux: Install the packages android-tools and scrcpy using your distro's package manager, there's also a snap package. (Debian) sudo apt install android-tools scrcpy (Arch) sudo pacman -S android-tools scrcpy macOS: brew cask install android-platform-tools brew install scrcpy USB Debugging: You can enable USB debugging in the device system settings, under Developer options. Go...
Read more

Add Two Numbers Without Arithmetic Operators 🙅‍♂️➕

-
Image
What if you are given a problem where you have to add two integers but you can't use any arithmetic operators ( + - * / % // ** ), like LeetCode's problem #371 . How do we approach this problem? Answer: Bit manipulation Problems like this can be solved using bit-wise operators as basic mathematics rules work in the same way whether it be binary or decimal. All we have to do is: Figure out how the basic mathematical operation works step by step. Replicate these operators using bit-wise operators ( & | ~ ^ << >> ). In case of addition in decimal system the process looks something like this: If sum of two digits is less than 10 we add it to our sum. If sum is greater than 10 then we add the least significant bit to sum and carry 1 to next operation. When doing this operation in binary which bit-wise operators do we need? Let's look at an example: 2 + 1 = 3 2 in binary is 010 1 in binary is 001 3 in binary is 011 Which b...
Read more