Tag: git merge

How many types of branches exist in git?

Struggling to understand how to work with remote branches and how many types of git branches there are I somehow got lost in differing namings and git versions. Here’s a few things that happened to me, while believing there are only TWO types of git branches: I unwillingly created a non-tracking local branch (so push […]

Git Merge without removing the other branch to pull the changes

I searched a lot but was not able to find a confident solution(pardon me as I am new to git and maybe I didn’t get some term well). So I will state my exact problem here: I have a software (say in branch main) of which I just released v5.0 and then I created a […]

Merging branch back with clean history

I am working on a branch (with others) off of master. A – B – C – F – G (master) \ D – E (branch-a) Periodically, we merge master into the branch, to minimize conflicts later. A – B – C – F – G (master) \ \ D – E – H (branch-a) […]

What does it mean that a Git push can not be fast foward merged?

Can someone please provide a simple example of what would cause a Git push to a central repo to fail because a fast forward could not occur? What would the local repo vs the central repo’s state need to look like in order for this to occur? Really having trouble visualizing this…

Why do I always have to merge manually on git pull?

I am a new user of git and can’t figure out how to get around this. I have had some experience with SVN and am going by SVN behavior. Any time I pull files from remote repository, and the file I have modified are also modified remotely, it needs merging. I can understand merge conflicts […]

Move develop changes to a new feature branch

For my project I use git-flow. I have master and develop branch synchronized with remote-repo Usually for all changes I create a feature branch, edit the files, commit the changes on the feature branch and close the branch with a merge in develop. But sometimes I forget to create a feature branch and I edit […]

Efficient project architecture with git

Firstly, let me introduce general architecture of a project. It is hierarchical. We develop server application for our customers. It is stored on main server. Say, local server 1, local server 2, …, local server n are the servers (main application instances) in different companies. Each company has one local server. Mostly all local servers […]

git pull options to prevent merge conflicts

Is there an option(s) when doing git pull that will not allow any possibility of a merge conflict? I’ve looked at the merge strategies but none seem to meet this description. I’m looking for an option like git pull –quit_if_possible_merge Basically, want a command for pulling to production site without any risk of a merge […]

Tortoise GIT – show changes created in branch after merge

is it possible to show only commits a and changes created in specific branch? If I do this before merge it works. If I merge master branch to this branch (to make it actual) then I see commits and merges made in master branch. Is some way how to filter it? thanks for help

git-flow: How to prevent some changes made at release branch from merging back to development

The question is about some edge case of git-flow methodology I have some kind of typical git-flow history like this: o—o—o—o [release-3.5.0] / —-o—o—o—o—o [development] Git-flow told us to merge release-3.5.0 branch into development then release is ready. So, eventually we’ll get ALL changes, made at release branch into development branch. o—o—o—o / \ —-o—o—o—o—o […]

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