2
votes
1answer
1k views

How to merge conflicts in Visual Studio 2012 using Visual Studio Tools for Git

I have VS2012 with Update 2 installed. I've installed Visual Studio Tools for Git. Now I want o fetch changes from the remote repository, but they are in conflict with my local changes? How can I ...
0
votes
0answers
13 views

Available branch name vars in merge

I'm trying to do a config command for merging branches. I see there are some vars available like $BASE $LOCAL AND $REMOTE These vars contain the name of the file followed by the base, local, remote ...
0
votes
1answer
57 views

merging git with vim without the automerged MERGED

I want to use vim (fugitive possibly) to merge my conflicts, but I hate the automerged conflict markers. I'm looking for something like |-------------------------------| | | | ...
11
votes
2answers
3k views

How can I Resync a fork from original

I just forked a project in Github. I made modifications and sent a pull request. The owner merged my fork with the main project and after that he made some modifications. So for now my fork is not ...
4
votes
2answers
4k views

Can checkout and track git branch, but cannot pull

So we have a branch in our git repo called creative_market. I run the command git checkout --track origin/creative_market which works fine. All of the changes that should be on the creative_market ...
0
votes
1answer
161 views

How to read the o/p of the 'git log' command?

I have cloned a Git repository and would like to visualize the different branches and merges. I ran the following command. git log --graph --full-history --all --color \ ...
4
votes
1answer
7k views

How can I merge two branches without losing any files?

I have two branches with the following files in there: branch a: file_a file_b file_c branch b: file_a file_d file_e I want to merge them, so that I get both files from a and b (and files that ...
2
votes
1answer
73 views

Merge master functionality into shared branches in Git

Suppose that I have several shared branches on my Git repository, for example: newfeature, experiment and gtkgui, and I share those branches in the origin repository. My team and I make some changes ...
3
votes
3answers
308 views

Polish before git merge?

I want to merge user branches into master, however, do some code review & modification before the merge commit. For example: o---o---o---o---o master \ o---o---o lucy Generally, git ...
1
vote
1answer
559 views

GIT : I keep having to merge my new branch

I have created a new branch and I'm working on it with others dev but for reasons when I want to push my new commits I always have to git merge origin/mynewbranch Otherwise I'm getting some errors: ...
32
votes
1answer
24k views

GIT merge master into a branch

I have been developing a new feature on a new branch, on the side I have committed quite a few changes on my master branch. I would like to know if it's possible to merge the master branch in my new ...