Questions about git-merge
Read more about git-merge
python (65.1k questions)
javascript (44.2k questions)
reactjs (22.7k questions)
java (20.8k questions)
c# (17.4k questions)
html (16.3k questions)
r (13.7k questions)
android (12.9k questions)
Why does merging an indentical commit with a different lineage work?
Common best practices say to never merge a feature branch which after it has been rebased. But it looks like if the contents of the rebased branch match exactly commits on the target branch, rebase wi...
Lee Avital
Votes: 0
Answers: 1
git merge question: how to accept your version of a file?
OK, I made a big mistake. I pushed a feature branch, and it was merged to main via PR.
Then I made additional fixes to the feature branch, and committed that and tried to make a PR. It said there wer...
John Little
Votes: 0
Answers: 1
Why local git repo does not see the merge executed on origin?
I created a pull request on branch "feature/90...".
I merged it in GitHub to the master branch (named "main").
The branch is not deleted.
On VS Code I can switch to master and fet...
Alex 75
Votes: 0
Answers: 1
GIT: send merge request reverting a revert
I have worked on a feature-branch, and I have sent a merge request
with the following commits
feature-branch: A - B
Someone accepted it by mistake, without reviewing it and it was merged in master.
T...
user60108
Votes: 0
Answers: 0