789 questions
0
votes
0
answers
19
views
Merge conflict with GitLab Web IDE
I'm editing a file in a merge request in GitLab's Web IDE. While I'm working, someone else commits changes to the same file, which creates a merge conflict. When I'm ready to commit my changes, GitLab ...
1
vote
4
answers
76
views
git rebase conflict take all changes from head on single file
If I have merge conflicts, how can I take all changes from HEAD for a single file? Not for the whole rebase, but for a single file?
Is this possible, or do I have to manually change it?
- 37
1
vote
0
answers
141
views
In a merge conflict, why would `git log --merge` only show a single commit?
I'm trying to merge the branch feature1 into the branch main, but I'm getting merge conflicts:
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working ...
- 10.6k
0
votes
1
answer
98
views
Merge from feature to dev Includes commits from dev to feature
I am experiencing an issue while merging branches in GitLab. I want to merge changes from the release-8 branch into dev, but after completing the merge, the commit history shows that changes from dev ...
- 13
0
votes
0
answers
37
views
Merging multiple branches all of the starting from the same starting point
I'm currently working on an integration activity, and I'm trying to do some automation.
So I usually have around 40 or 50 branches which all start from exact point from master.
Then I create PRs and ...
0
votes
2
answers
139
views
Make Git aware of moved files (at time of a merge conflict)
Scenario
You create a new branch, move a file, and modify its contents. Simultaneously, on a different branch, another developer makes changes to the same file without moving it. When their branch is ...
- 29
-2
votes
2
answers
196
views
Why Git can't merge on the server-side if there are no conflicts
I've been using Git for a long time in a lite mode: branch, pull-commit-push, merge. Mostly with SourceTree. That was enough for development. So I'm an amateur)
But now I've got a repository that is ...
- 852
0
votes
0
answers
69
views
Issue with solving merge conflict on pr in bitbucket
Context: I have a feature branch based on a main branch. Now I created a pr in bitbucket to merge my feature in the main branch and there's a conflict.
To resolve the merge conflict, I thought it ...
0
votes
1
answer
71
views
Git: Safely merge overlapping directories across repositories
My team and I work on a large repository with some core plugins and multiple independent floating plugin repositories. Recently, a plugin has been promoted to the main repository with some changes, ...
- 839
1
vote
2
answers
1k
views
How to merge master to feature-branch only using Gitlab GUI/Web IDE?
Maybe an odd situation, but I have fiddled with this myself and searched several forums without any luck. Is this even possible without setting up a local environment and cloning the repo?
For some ...
- 191
0
votes
1
answer
194
views
Cant Resolve Merge Conflicts in VSCode in a Submodule
Problem
If a Merge Conflict occurs in a Submodule in VSCode the Merge editor opens and i can resolve the conflict, after that i can commit those changes.
But after that i cant click on continue or ...
- 24
1
vote
0
answers
133
views
iCloud Drive Resolve Version Conflicts modificationDate issue
I've encountered an issue after integrating iCloud Drive wanted to bring it to your attention.
Let me walk through the scenario:
I have two devices linked to the same account, an iPhone XR and an iPad....
- 530
4
votes
2
answers
2k
views
Cant get merge conflict to appear locally but Azure devops says I have a conflict?
Normally when I have a merge conflict my visual studio code editor will let me know of the incoming changes, but in this case when I pushed up some code Azure devops said I had a conflict but I cant ...
- 448
0
votes
1
answer
87
views
Why is the BASE file generated by TortoiseGit in merge conflict resolution 0 bytes?
I am finding the built-in TortoiseGitMerge tool very underpowered at dealing with even slightly complex changes, so am looking for an external tool that might do a better job.
I am trialling WinMerge, ...
- 2,200
-2
votes
2
answers
201
views
Resolving merge conflict with several commits on a branch
I have a master branch, branch_a, branch_b
branch_a I cut from master where I have local & origin commits as a1, a2, a3, a4
Now I cut branch_b where I have local & origin commits as b1, b2, b3,...
1
vote
1
answer
191
views
How to Auto-Resolve Git Subtree Conflicts with Three-Way Merge Strategy?
Hello Stack Overflow community,
I'm currently dealing with a scenario involving Git subtrees and conflicts. Here's a breakdown of my situation:
I have a repository A that includes repositories B and C ...
0
votes
1
answer
953
views
How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?
How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?
Checked the pull request merge conflict extension and azure devops, didn't found any option to set ...
0
votes
1
answer
218
views
Merging two protected branches in gitlab after squashing commits
So the situation is this: we have two protected branches in gitlab "develop", and "test" (over which we dont have permissions to push onto without merge requests), we merged the ...
2
votes
1
answer
148
views
Forcefully set files status as "unmerged" in a Git repository
When I merge a branch into another one, and get conflicts, Git tells me some files are unmerged. For example:
% git status
On branch test-merge
You have unmerged paths.
(fix conflicts and run "...
- 3,926
-1
votes
1
answer
167
views
How to disable `npm-merge-drive` in git merge
When I cherry-pick some commit that has conflicts with package-lock.json file, the npm-merge-drive run
when it failed the cherry-pick fails, how can I remove it?
- 3,890
1
vote
1
answer
416
views
How to handle multiple reviews on several merge requests?
I have worked on a GitLab repository for several months. In my institute students have to wait for a supervisors review in order to be able to merge into main. My Reviewer did not have time for ...
- 11
0
votes
0
answers
51
views
How git detect conflicts when merging
I don't understand in what condition do git consider there are conflicts when merging two local branches.
When I create a file a.py in branch test1, then merge it to another branch test2, and then ...
- 11
-1
votes
1
answer
111
views
Github: Why revising a csv file in a branch results in a conflicting merge?
I'm sorry for this very basic question but I can't understand why revising a csv file that I pulled from the master would create a conflict in my pull request.
What happened is, I have a collaborative ...
- 129
1
vote
2
answers
4k
views
How do I view code while resolving merge conflicts in PyCharm
Say I have a repo with 2 files:
source.py
def foo() -> int:
return 1
conflict.py
from source import foo
def bar() -> int:
return foo()
Now, I create and try to resolve a merge ...
- 381
0
votes
0
answers
56
views
Moving a line is not atomic in git
Imagine the following git flow:
R1 refactoring #1
/ \
/ \
---A------M1---M2--- master
\ /
\ /
R2----- refactoring #2
The code ...
- 1,954