How to merge two different GIT repositories sitting on two different places

-
So recently in office i had to push the code that i was working with to my client's own code repository. My code base was on Gitlab and client had his own repo on BitBucket. Basically the same code base but on two different places. So how do i merge my code into client's repo ? i found this answer HERE on this great article.

But i will explain what i did step by step just to make it clear to you.

Let's assume that my requirement is to merge a repo called my-source into my-target. my-source is on Gitlab and my-target is on BitBucket.

Here are the steps.

1. Clone my-target on your trusty computer in a preferred folder.

2. Add the source ( the repo which you are trying to merge into your target ) as shown below to the local repo you cloned in step 1.

 git remote add -f my-source https://git.myawesomecodebase.com/my-source.git

 3. You're almost there , now merge your branches together. In the following example i'm merging a branch called develop into my target repo.

git merge my-source/develop --allow-unrelated-histories

Please note that you have to use --allow-unrelated-histories here otherwise you will get an error.

Ok that's it ! You are done ! Your code is now merged.

Bonus tip

 Feel free to pass any merge parameters of your preference like no fast forward , no commit , strategies etc. An example of how i usually run the merge command is shown below.

git merge my-source/develop --no-commit --no-ff --strategy-option theirs --allow-unrelated-histories

 Enjoy !
'

Comments

Post a Comment

Popular posts from this blog

OneNote Code Format plugin

-
If you are using OneNote like me to keep your shit together and ever wondered why this does not have a built in code formatting option, then your worry days are over. No one wants to see their code lying around without formatting in plain text form , so make use of this plugin to make things prettier. https://www.makeuseof.com/tag/programmer-onenote-coding-add-on/ 
Read more

Wasted about an hour of my life on something so trivial

-
Image
 Ok guys so i wasted about an hour trying to figure out how to bind to the "disabled" property in a textbox in angular. And after trying for a long time i realized that my code is not working as expected because , you have to use null instead of "false" to control it. Please refer to the stackoverflow answer below. Darn it ! https://stackoverflow.com/questions/42179150/how-to-disable-a-input-in-angular2/43765804
Read more

With Values

-
Image
 Using the clause WITH VALUES when you are adding a new column to an existing table using Microsoft SQL Server is a handy little trick. The use of WITH VALUES is when you want to add a default constraint to an existing table that allows null . Because when you add a default constraints that allows null it will NOT fill the existing rows with a value, this can effect your database logics ( if you have written some code depending on these values ).  Let me demonstrate this with some simple tables. Create a simple table CREATE TABLE Students( id int NOT NULL, name varchar(50) NULL ) Add some sample data insert into Student (id,name) values (1,'Cappadonna'), (2,'UGod') Add a new column to the table , with NOT NULL  clause ALTER TABLE Student ADD age int not null CONSTRAINT age_default DEFAULT 99 Now if you query your table you will see that the existing rows are being populated with your default value. This is because we added the constraint as NOT NULL.    No...
Read more