python (12.9k questions)

javascript (9.2k questions)

reactjs (4.7k questions)

java (4.2k questions)

java (4.2k questions)

c# (3.5k questions)

c# (3.5k questions)

html (3.3k questions)

Questions - git-merge

Git merge with renames on one and same changes (formatter) on both sides

I've got two long living branches develop and next, where every commit in develop has to be in next as well. The files in next have been moved to different folders. Now I want to apply a formatter on ...
test-img

chkpnt

git

rename

git-merge

git-merge-conflict

Votes: 0

Answers: 0

Can GitLab handle multiple changes to a file

I have a scenario where one developer created a branch, made changes to a file and submitted changes to git. At the same time another developer created a different branch made changes to the same fil...
test-img

DanConsultant

git

git-merge

Votes: 0

Answers: 3

Latest Answer

When there is such conflict, there is usually a problem which is raised during the merging, saying something like: "a conflict needs to be resolved. Solve it and commit the changes". Then th...
test-img

vinalti

Peepcode-git.pdf: Best strategy to keep a long standing feature branch in sync with main branch with rebase

In the following documentation peepcode-git.pdf located at https://github.com/pluralsight/git-internals-pdf/releases, page 39 notes different use cases for rebase. Particularly this quote: "If yo...
test-img

LeanMan

git

version-control

git-merge

git-rebase

branching-and-merging

Votes: 0

Answers: 1

Latest Answer

This is a simple misunderstanding. The suggestion is not what you assumed: If I am working on a long task however, I don't quite understand the idea of rebasing main onto my branch to stay in sync......
test-img

TTT

Proper way to merge dev into main branch

I am working in a company and we decided that we want to use git more properly. I am responsible for integrating dev branch into main branch, and I am a confused as to how to correctly merge in differ...
test-img

Psychotechnopath

git

git-merge

Votes: 0

Answers: 3

Latest Answer

Your understanding of what git merge --no-ff does is nearly correct. The part that perhaps needs tweaking is your use of the word integrates for just fast-forward, whereas it's important to realize th...
test-img

TTT

Posts

Questions

Blogs

Jobs