All Questions
Tagged with git-merge-conflict git-commit
12 questions
0
votes
1
answer
90
views
Git Conflict Resolution Challenge: How to restore last saved code after conflicts
I am encountering challenges in resolving conflicts in my React Native project using GitHub Desktop and VSCode. I worked in a branch fonts-and-colors that is forked from main. I was going to commit ...
- 41
0
votes
1
answer
281
views
How does Github (not Git) solve merge conflicts when pushing to remote repository?
I have completed two Github tutorials but this topic was not covered in any of them.
My confusion is, when 5 developers are working on the same branch, they all start working at 10 in the morning, ...
- 1,026
-2
votes
1
answer
2k
views
git: Your branch and 'origin/master' have diverged - I don't want to push "27 different" commits and want to uncommit them and keep the local commit?
Your branch and 'origin/master' have diverged,
and have 1 and 27 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree ...
- 5
1
vote
0
answers
36
views
git command to show the merge sources for %A and %B
What I want to know are the commits from which %A and %B are drawn.
I am writing a merge driver that can apply domain knowledge and clean up 99% of merge conflicts in a certain set of files for which ...
- 43.1k
3
votes
1
answer
744
views
git: Commit staged changes (without merge conflicts) during merge
We have a project (Microsoft Business Central) where we have to do a very big merge with thousands of merge conflicts. When we merge the two branches we get about half the changes as staged changes (...
0
votes
2
answers
399
views
I have been creating new Git branches from older branch without checking out to the master
I have been checking out to new branches from the older branch, instead of checking out to the master.
currently, I have created four new features: home_feature, admin_user-feature, customer_request, ...
- 51
2
votes
3
answers
864
views
In my first commit I am unable to push the changes as i already have .gitignore and README.md in my github,diff from local
I am very new to git and I am self learning it.
I have created a repository in github which has these two files .gitignore and README.md. only.
Now I have an angular project in a folder in my local.
...
- 986
0
votes
1
answer
335
views
git merge multiple commits into one in an orphan branch each commit in a prefix subdirectory
I need a merge more than 1 commit each from a branch or a remote repo into a single commit in another branch.
input branch#1: o--o- - -o (C1)
\
input branch#2: o--o- - -o |...
- 2,717
1
vote
0
answers
14
views
Is this content of a rebased commit different to that of the original commit?
I am trying to understand why repetitive conflicts occur during rebasing. I begin with the concept that if a conflict is resolved and thus results in new commits being created, there should be no more ...
- 12.4k
5
votes
2
answers
1k
views
GIT: how to merge changes, which were earlier removed from the merged commit
I have two branches, develop and master. I wanted to cherry pick some commits regarding one specific feature from develop into master. But the number of commits cherry pick able from dev to master ...
- 1,905
1
vote
1
answer
205
views
Git: Weird phenomenon in commit conflict
I'm new to the git world and here is a very weird commit conflict problem which is happening to me all the time. I use git through eclipse.
It is pretty weird so I try to explain it simply. Here is ...
- 11
3
votes
1
answer
193
views
How to merge a git branch that results in only a single commit (like using --squash), but allowing future merges without conflicts?
I have a branch with many commits in it since creating it and would like to make a single merge commit to move it back to master, usin a single commit. So the only solution I know if is to use git ...
- 3,077