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 to selectivley remove a merge of feature branch from merged branch?

I am creating feature branches like this - feature/featureA feature/featureB feature/featureC feature/featureD feature/featureE All these branches are getting created from the development branch and then it gets merged back to development…
user2869736
  • 133
  • 9
1
vote
1 answer

git merge - Files are still "dirty" after successful merge

After I did merge, solved the conflicts and comitted them, everything in the VS code is clean from merge conflicts. But when I do yarn start and refresh couple of times, the console still shows me unexpected signs: Even though the file is clean…
A.v.
  • 49
  • 6
1
vote
1 answer

How to “abort” merge in IntelliJ Idea version 21?

I use IntelliJ IDEA the latest version with Git. I have created a new feature-branch and changed some things in the pom. The same time other colleges worked on master, and they have pushed their changes into master. I did merge my feature-branch to…
itro
  • 7,006
  • 27
  • 78
  • 121
1
vote
2 answers

Pycharm Merge Does Not Show All Branches

When I click branches at the right bottom corner I can see all the branches I need: But when I open the Git -> Merge window: I tried to Git -> Fetch but that does not solved my issue. Why my branch showing up in the branches section but not in the…
Muhammed Ozdogan
  • 5,341
  • 8
  • 32
  • 53
1
vote
2 answers

Will git tag automatically move to main branch when merged?

I have created a git tag in the dev branch. But if I merge it from dev to main branch, will the git tag be automatically be added in the main as well?
Muzzlet
  • 219
  • 3
  • 18
1
vote
4 answers

Starting branch2 off of branch1 vs starting branch2 off of master and merge in branch1

I have a feature branch (branch1) that was approved but not yet merged into to master (have to wait for deployment CI to be fixed). I want to get started on another branch (branch2) which needs branch1's changes in it. Would it make more sense to…
user15909643
1
vote
1 answer

How to incorporate all changes I have made in one Git repo to another repo?

I have two similar Git repositories. One is hosted on GitHub, called myrepo_github; and another one is hosted on GitLab; called myrepo_gitlab. The two repositories are similar in the sense that they are frequently merged in our company, and they…
zell
  • 9,830
  • 10
  • 62
  • 115
1
vote
0 answers

In PyCharm, is it possible to deploy automatically to remote host after git merge?

I'm using the PyCharm Professional version, and I write the project code on a Windows 10 laptop (noted as A), and use the Deployment tool in PyCharm to sync the code with the remote client with Ubuntu (nated as B). And at the same time, the project…
mining
  • 3,557
  • 5
  • 39
  • 66
1
vote
1 answer

Resolving merge conflicts after reverting a merge commit

I have merged a feature branch into develop. After that I have found a bug in the feature branch code so I have reverted the merge (branch develop) : git revert -m 1 git push origin develop Next I have fixed the bug on the…
Irbis
  • 1,432
  • 1
  • 13
  • 39
1
vote
1 answer

Build not running in CICD after merge request

I have a set up a pipeline .gitlab-ci.yml where build and deploy to dev works fine. The rule is to run a pipeline for QA after the merge request from develop to QA. When I create a merge request it runs a pipeline only for this stage ,it is not…
Mani
  • 721
  • 3
  • 10
  • 24
1
vote
0 answers

Is there a way to get a pre-merge hook, or similar behavior, from git?

I really could use a pre-pull/merge hook. It isn't because of the repo itself. It's because of what the repo interacts with. Equivalent behavior would be fine. Example: Our repo controls a docker-compose file. If the name and/or tag for an image…
Lachele
  • 46
  • 1
  • 5
1
vote
1 answer

Git: last merge commit ignored

These are my steps. Step 1: Merge develop into feature Step 2: Check if everything is OK and immediately afterwards merge feature into develop When I did that I got the following situation: Only "merge develop into feature" is shown and "merge…
Jakov
  • 879
  • 2
  • 17
  • 36
1
vote
1 answer

View date of last commit from each branch affecting merge conflict

When I have a merge conflict like: <<<<<<< HEAD some code ======= other code >>>>>>> branch-name is there a way to see date of last commit that affected some code and date of other commit that last affected other code?
mmmm
  • 607
  • 6
  • 14
1
vote
0 answers

Simple git rebase intermittently requires --continue for unknown reasons--what might be causing it?

I sometimes make periodic "checkpoint" commits if I'm making a lot of changes. When I'm all finished with my big changes, I use git rebase -i to squash them all into a single commit. I do this all on one branch, no merging to main or anything like…
SaganRitual
  • 3,143
  • 2
  • 24
  • 40
1
vote
0 answers

How to solve the git revert conflict using tool?

I want to revert some commit. but, when the conflict is occurred, can i use tool for solve conflict? I temporary using git mergetool, but it create .orig files. There is any other commands to solve it? When i using git mergetool. The situation is as…
H.YK
  • 57
  • 7
1 2 3
…
99 100