Merges together two different branches of history by incorporating commits into the currently checked-out branch.
0
votes
1answer
24 views
Undo git fast forward merge
I have this situation :
Working on some testBranch for some time and I wanted to sync with master so I did
git checkout testBranch and
git merge master/testBranch
So now my branch is synced with ...
3
votes
2answers
41 views
how to merge specific files in git
Suppose I have a project on MASTER branch with 100s of php files. To do a bug fixing in the project, i create a separate branch
git checkout -b bugfix
Then after fixing the bug in 3 files (for eg ...
0
votes
2answers
25 views
Merge a branch, but dont fill gitk with noise BUT dont lie about where it came from
Im' probably doing this wrong or misunderstanding something here but basically I do not want to fill our master branch with noise but i do not want to lie about my history.
So we have a master ...
0
votes
0answers
14 views
Git merge results in a delete conflict when neither the local or remote branch deleted the file
I am trying to merge two local branches together. Let's call them 'A' and 'B'.
git merge A B
This resulted in several merge conflicts, which I began to resolve using kdiff3:
git mergetool
As I ...
2
votes
1answer
33 views
how to find git merge commits which merges into current branch
At my company we are using git flow to manage the development of a number of sites.
All of these sites are forks of a base repo. It is easy enough to update the sites with updates from the upstream ...
0
votes
1answer
16 views
Merge one common directory of two different repositories
I have two different repositories. What I need to do is to merge one common directory of those. The relative path of this directory is the same for both repositories.
0
votes
1answer
32 views
Force merging in a branch in git
Currently I am on branch foo, and I want to merge changes from branch bar, which git apparently thinks is part of foo's history, due to reasons that are complicated to explain.
Unfortunately, the ...
0
votes
1answer
8 views
gitosis auto merge hook
I'm trying to auto-merge between two stable branches using gitosis hooks.
I've found an article that describes how to do this using just git hooks.
I'm just uncertain how to do the same thing using ...
0
votes
1answer
25 views
Git Merge without removing the other branch to pull the changes
I searched a lot but was not able to find a confident solution(pardon me as I am new to git and maybe I didn't get some term well). So I will state my exact problem here:
I have a software (say in ...
2
votes
1answer
20 views
DIRTY_INDEX at merge
I fetched some updates from upstream, merged, and got the following error message:
FAILED: DIRTY_INDEX [filename]
After a reset and another merge, I get this error:
FAILED: DIRTY_WORKTREE ...
0
votes
0answers
17 views
Github merge --no-ff with Github for Mac app
I have a requirement in my project to merge my branch to Master using a "--no-ff" merge.
I would like to use the github for mac app, which doesn't seem to have advanced options for merging.
How would ...
0
votes
0answers
16 views
Local merge of a temporary branch looks good, but git pull tries to undo everything from merged branch
My local EmployerEmail branch is about 10 commits ahead of my origin EmployerEmail branch (on github). In those 10 commits, I made a local branch, did some work, and merged back to the parent branch. ...
1
vote
0answers
20 views
Same variable names used in two branches (Git)
As a social scientist trying to use Git, I have an incredibly newbie question.
Say I have two branches, each contains a variable foo. When I merge these two branches, the variable foo will be defined ...
1
vote
2answers
30 views
Have a feature branch in git and can't merge master after reverting a merge from a different branch
We have implemented a kind of git flow workflow in our company but not everyone is actually using git flow yet so there are some hiccups. Here is one.
A colleague was working on a feature branch and ...
0
votes
1answer
51 views
How to interactively (visually) resolve conflicts in SourceTree / git
I'm using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.
But, I'm wondering whether there is a nice way to interactively and visually resolve ...
