789 questions
0
votes
0
answers
41
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 ...
0
votes
1
answer
93
views
Is there a command to "accept both changes" and swap the order in VSCode?
I prefer to use the normal text editor (not the merge editor) to resolve merge conflicts in VSCode. Sometimes, I need to accept both changes, but want the new text from the "incoming" change ...
- 1,549
3
votes
5
answers
147
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?
- 57
2
votes
1
answer
148
views
How to correctly merge household survey data when both datasets have multiple rows per household?
I am working with NSSO household survey data in R. The data is spread across multiple blocks:
Block A (roster/master file) → one row per household member.
Example: a household with 6 members will ...
1
vote
0
answers
153
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
0
answers
198
views
Winmerge 3-way compare configuration
I use Git to invoke Winerge, and this is the current setting:
[mergetool "winmerge"]
cmd = \"C:/Users/RD/WORK_FILES/Tools/WinMergePortable/App/WinMerge64/WinMergeU.exe\" \
...
0
votes
1
answer
106
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
78
views
How to resolve a merge conflict using command line or github [duplicate]
I submitted a few files, all to separate branches and made a PR. But my PRs were closed with unmerged commits because I had to fix some issues with my code. I resubmitted after and made new PRs but ...
0
votes
0
answers
40
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
0
answers
49
views
Merge replication how to apply latest subscriber changes
I use merge push replication, everything works. I have a publisher server and two subscribers, if both subscribers change the same value in a row in the table, I get a conflict, the one who changed ...
user22915712
0
votes
2
answers
144
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
1
vote
1
answer
748
views
How to resolve the conflicts locally the same way as resolving the conflicts on github?
Let's say I have a branch called feature-branch, and it's behind main by several commits. When I try to merge main into my feature-branch locally using:
git merge origin/main
Git pulls in all the ...
-2
votes
2
answers
206
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
1
vote
0
answers
224
views
non-interactively resolve git conflict on generated file
In my case we're using python poetry, so the lockfile in question is poetry.lock, but I imagine this use case is meaningful for many other kinds of lockfiles in git.
We frequently find ourselves with ...
- 77.8k
0
votes
0
answers
78
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 ...
