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.
git-merge
3,408
questions
0
votes
1
answer
25
views
Why does `git pull origin master:master` from non-master branch cause branch to be rebased?
I'm on branch master and do git log
commit 9937b91089895fac45a39a3bda2935e19eb42554 (HEAD -> master, origin/master, origin/HEAD)
...
git status prints
On branch master
Your branch is up to date ...
- 831
-1
votes
0
answers
15
views
How to remove a commit showing up on merge request activity on home page
I accidentally added a sensitive file to my GitLab commit. The branch is part of a merge request and I don’t have admin rights to this repository.
I deleted the commit by rebasing it. I then did a git ...
- 103
0
votes
1
answer
34
views
How to create a git workflow based on splitting your current branch into two, and later picking one to PR? [closed]
I've create a feature branch feature/CRM-123_some_feature, where CRM-123 is the Jira ticket ID.
I've tried doing it one way, and made a local commit. After testing, the performance was not great, so I'...
- 11.7k
0
votes
1
answer
26
views
How can I force IntelliJ to resolve conflicts, which are already committed in a file by another person
Using GIT, I checked out a branch from the remote repository, which another person had worked on. One of the files has conflicts, which are already committed, so the file contains marks like <<&...
- 87
1
vote
0
answers
34
views
Git: Want to propagate (rebase) LF vs. CRLF changes through branch revisions
Say, I have a branch with several commits in it.
In versions A and B, I have a file with mixed line endings (mostly LF, but some CRLF), and made various other changes to it.
In version C, I made ...
- 486
0
votes
0
answers
11
views
DiffMerge: Identical Files Marked As Inequivalent
I am comparing two folders, one I pulled down from GitHub and one that I've been working on locally and would like to push. DiffMerge displayed the files as different, as expected, so I went in and ...
- 636
1
vote
0
answers
39
views
View content that was added during the merge and comes from neither parent
During a merge with git 2.42.0.windows.2 and the Bash console, I had to manually perform some modifications to get it to compile, which I then committed along with the modifications due to the merge ...
- 1,161
0
votes
1
answer
49
views
Git good practice : Merge changes on some files, ignore other new files
Using git 2.42.0.windows.2 and the Bash console, I have a branch H with some changes to module V (some of which are coming from another branch O), a new module L, and a module C that is from that same ...
- 1,161
1
vote
1
answer
50
views
Confused about Git merge with multiple branches. How can I merge the changes made in a branch created from an existing Pull Request branch? [duplicate]
I had a project where I had to make some changes.
I created a first Pull Request:
git checkout -b v1
This PR is waiting to be reviewed and approved by my team lead.
Meanwhile, I had to open a second ...
- 11
0
votes
1
answer
42
views
Branches out of sync because of git cherry pick - how to resync
So I started working on a project with two branches-
master
stage.
The strategy has been to cherry-pick commits from stage to master and multiple teams do the same everyday.
Now this has caused ...
- 183
1
vote
1
answer
39
views
How can i preserve changes in main branch that are deleted and committed in feature branch in git?
I have main branch and feature branch, feature branch is created from main
branch.
Mistakenly some lines of code got deleted and committed in feature branch due to merging of branches.
Example:
main ...
1
vote
1
answer
36
views
which file ends up in the repository when I merge?
I'm teaching myself git and I was wondering: if I merge a branch with master and a commit in the branch is older than a commit in master that alters the same file, do I end up with the branch (older) ...
-1
votes
0
answers
44
views
How To Use a Git Branch Multiple Times?
I created a new branch feature1 and after completing a basic implementation, I merged it into the main branch. I then continued working on other features. After some time, I want to go back and ...
- 1,952
0
votes
2
answers
93
views
What does merge xx into xxx mean
In my repo, I have one branch (branch_1) and from it, I have been committing some changes. Then I created a new branch from branch_1, branch_2.
Master---
\
Branch_1--commit1--...
- 2,236
2
votes
2
answers
52
views
During a Git merge conflict resolution, can I check out the conflicting state of a file?
When git merge has conflicts, the files that are in a conflicting state contain markers showing the differences.
Suppose that while trying to resolve a conflict, I've made changes, perhaps:
Taking ...
- 125k