Stack Overflow
Stack Overflow

Questions tagged [git-merge]

git-merge is a git command which integrates changes from another branch by incorporating commits into the currently checked-out branch.

A merge in version control is an operation where two sets of changes are combined to have both features available.

Git provides sophisticated merge support by automatically detecting simple merges (i.e. if only changes on one branch happened, also called fast-forward) and allowing plugable merge-strategies for more advanced use-cases.

3320 questions
1
vote
1 answer

How can I resolve git merge conflicts by keeping my version of files that I changed?

I have two Git branches, mybranch (which is checked out) and theirbranch. I would like to merge theirbranch into mybranch, resolving conflicts by keeping my version of a file if I've changed it (i.e. it has changed on mybranch since the last common…
Kerrick Staley
  • 1,583
  • 2
  • 20
  • 28
1
vote
1 answer

Have problem merging a branch - none of the changes were merged into the master

We are still learning GITHUB. So, we try something really simple. A coworker created a branch. Then, when the code changes were ready, he created a pull request for me to review. I reviewed the changes and there were no conflict. There were a lot of…
steppdev
  • 11
  • 1
1
vote
1 answer

Setting up Unity Smart Merge with Git and Meld for Unity 2019.3+

I looked everywhere for documentation on this matter with little to no success. Unity's own documentation is very much incomplete when it comes to this dynamic. I am here to provide you with the only way I've been able to get it to work. Of course I…
Justin Anthony
  • 416
  • 1
  • 3
  • 13
1
vote
2 answers

How did the Git merging from Branch A to Branch B has updated the code in Branch A too?

I have two branches (branch A and B) with different files in each. I have created new pull request to merge the code from branch A to B. I expected that those changes which are not present in branch B but present in branch A will be merged and only…
user1122
  • 47
  • 1
  • 6
1
vote
1 answer

How to programmatically detect incorrect (not rebased) merge bubbles in master?

Our dev process states that every developer should rebase his/her topic branch to master first and then merge it with the --no-ff flag, to create a merge bubble. This results in a nice and easy to follow history graph. However, sometimes developers…
katericata
  • 1,008
  • 3
  • 14
  • 33
1
vote
1 answer

GitLab Merge Request attach a file

When I try to attach a file on my GitLab Merge Request, I see the below on the description text area, My question is does GitLab store the attachments in a temporary storage? Also I see some random ids/keys generated in the path as seen in…
Rahul gone mad
  • 81
  • 1
  • 6
1
vote
1 answer

Git merge develop branch into feature branch

i'm a git newbie and i'm having difficulties with merging. Using git-flow, we have a master and a develop branch. Each feature we develop has a proper branch ( let's call it DEV-738 ). While i develop my feature, another developer works on another…
Tiziano
  • 316
  • 1
  • 4
  • 17
1
vote
1 answer

Why doesn't introducing a bug create a merge conflict with git?

I am new to git and trying to understand merge conflicts. I start with this program on the master branch, in file helloworld.c: #include int main () { printf("Hello world!\n"); } I then create a new branch called dev2: $ git checkout…
Anthony Mannucci
  • 277
  • 2
  • 12
1
vote
2 answers

Migrating from Jenkins Ci Service to gitlab-ci.yml

Until now we were using Jenkins to run our build on any feature branch based on the Jenkins CI service. We are currently experimenting with pipelines based on gitlab-ci.yml. As a starting point I would like to limit this only for specific branches…
Haim Raman
  • 11,508
  • 6
  • 44
  • 70
1
vote
3 answers

Keeping repositories in sync without being able to push and pull commits

As of right now, I cant use an git server, so I use one of my favourite git features which is turning any directory in my computer into a git repo ( just the git init thing). I use to do this because I was the only one coding and I could keep track…
filippo
  • 5,583
  • 13
  • 50
  • 72
1
vote
1 answer

How to properly clone and switch to existing branch of fork

I had been working on a branch of a fork associated with a merge request and I was stupid enough to accidentally delete my local git folder. Luckily, all code changes had already been pushed, but I can't figure out how to properly recreate the state…
Sora.
  • 1,395
  • 1
  • 11
  • 14
1
vote
1 answer

How to exclude a package.json from a git merge?

I have three branches in the repository. master slave 1 slave 2 there is one package.json file. It should be different in each of the branches. But if I run the git merge master command. These two branches merge into one. How to exclude…
Sergey
  • 418
  • 1
  • 7
  • 21
1
vote
2 answers

Git - Unmerge a deleted branch

Scenario: Created a Feature Branch From Master(Blue Color Branch) Made commits to it Later Merged with the Master and Deleted the Branch In between, I have created other Feature Branches and made commits to them. Question: How can I get back the…
Harish ST
  • 1,475
  • 9
  • 23
1
vote
1 answer

Does github automatically merges the PR to the parent branch also?

I never faced any issue in git and github regarding the PR. Today a very strange thing happened. There were 3 branches. Master, Beta_A and Beta_B. Both Beta_A and Beta_B were made out of Master and they use to give PR to Master only. Today for one…
Abhiraj Tulsyan
  • 113
  • 4
  • 13
1
vote
1 answer

After merge files still outdated

I have two branches dev sprint5 when I merge form dev (after solving some bugs and adding features) into sprint5 IDE show me strings.xml file as conflict file, so I solved conflicts manually and click applied, and merge is done but when I…
Mahmoud Mabrok
  • 1,362
  • 16
  • 24
1 2 3
…
99
100