Tag: git merge

Merging two git repositories from some specific commit

I have to make a merge between repositories. I was working with some people in project A. Once we finished project A, we started the project B. Project B has project A as base so we cloned A removed the git files and started working with this files (I don’t really know why we did […]

Git Submodule in branch not master

EDIT: According to @VonC in the comments I have a nested repo, not a submodule. However my problem remains the same below: I created a branch off of my local repo to work on a new feature. The new feature required me to install the Azure PHP SDK via composer. Turns out that the Azure […]

When you `git show` on a merge commit, what does the diff mean?

When I git show on a merge commit, it usually shows no diff, but sometimes, it shows a small diff. What is it showing me? My guess would be that it’s showing how any conflicts were resolved.

Merge codes from different authors on github

I am new to GitHub so please excuse my dumb question. I have a repository on GitHub with 2 contributors (one is me and the other is X). I had pushed some code in the repository with say 5 files(a,b,c,d,e). Now both of us (X and me) downloaded that code and modified it. X modified […]

Avoid merging master into development branch

I have been monitoring two branches starting from each sprint – Release and Master. Master branch is from where developers create new branch(task specific), implement their changes, and creates pull request which gets merged into the Master. Release branch is sprint specific which remains always submittable to the production. We only merge branches committed to […]

Git rebase circles back to same place again and again

I am having problem with Git rebase that I have to merge the code again and again but still unsuccessful. I had cut of my branch (A) from master. I started working on my branch and made more commits. At the same time, master was also changed and underwent bunch of commits. Now I am […]

git – exclude commits when rebasing

I have recently merged a feature that was not ready to go into master. Without realizing it I rebased the bad master into another branch that was good. But now I am not sure how to pull those bad commits out of my other story. HERE is my git log file commit 15bb0d630f9b9cf59axxxxxxx8100d3a7302 Author: Moises […]

Map remote repository to an existing directory with files

I have the following issue and cannot find a solution. I have downloaded the repository yii2-debug from GitHub some time ago (az a ZIP file). I changes some files (I know I should not do it, but there was no other option). Now I want to upgrage to the newest version, and I want to […]

Switching a team from Git Merge to Rebase

Our R&D works with two central repos, originally started by very stubborn smart people, one works with rebases and the other with gitflow and merges. While I’m very comfortable in using merges and I see most github projects use that modality, there’s pressure on us to conform to “rebase”, as we are moving to a […]

git rebase upside down

I’m trying to rebase my local feature branch on remote branch called ‘integration’. So I did- git checkout feature git rebase integration but in my conflict resolution editor, I see changes from feature at the bottom and ‘integration’ on top, which I believe is upside down. How do I fix it? It looks like- <<<<<<< […]

Git Baby is a git and github fan, let's start git clone.