current community

your communities

more stack exchange communities

company blog
Stack Exchange Inbox Reputation and Badges
tour help

Tagged Questions

Merges together two different branches of history by incorporating commits into the currently checked-out branch.

learn more… | top users | synonyms

1
vote
1answer
13 views

Git merge overwrites rather than giving conflicts

I'm trying to merge two repositories. But whenever I merge, it should give conflict in sample.txt file rather that overwriting the same. Steps followed are in attached image.Git version is : 2.7.4 Is ...
0
votes
2answers
18 views

merge unfinished feature into unfinished feature

My project is using git flow. My current feature (A) is up for review and will then go into test, wich may actually take a few days. I also have to start the next feature (B) wich heavily depends on ...
1
vote
1answer
27 views

git cherry picking to a different base directory

I have certain commits in a branch, 10.57, which I want to merge to another branch 10.58. I would normally cherry-pick those commits from 10.57 to 10.58. There is however a glitch. Certain files ...
0
votes
0answers
11 views

How to subtree merge multiple branches at the same time

I'm doing a subtree merge of one existing repo into another existing repo. The repo I am merging as a subtree has many many branches (say 40 different branches). How can I merge the repo with all ...
0
votes
1answer
30 views

Merging existing Git repository into self made folder within another existing repository

My scenario: I have two existing Git repos: Project-A Project-B I have merged Project-A into Project-B via a subtree-merge with no issues. Mostly following the 3rd answer here: How do you merge ...
-1
votes
1answer
22 views

How to merge a branch without deleting local files?

Let's say I have a repository with a main branch master and 3 files: fileA [tracked] fileB [tracked] fileC [tracked] I create a new branch test and I delete fileB Now I want to go back to master ...
1
vote
2answers
29 views

git merge: how keep master version of file?

I'm using git and am merging a branch into master after a pull request. My understanding is that if a file in the master wasn't changed since the last common ancestor, but the same file in the branch ...
0
votes
1answer
30 views

Why sometimes the nuget packages fail after merging in git

I had a problem about nuget packages sometimes when i merge two branches in git. I search and found which the problem is about solution user options(.suo) file, then after removing it and restarting ...
0
votes
0answers
11 views

Syncing fork with upstream: git fetch + git checkout + git merge vs. git checkout + git pull

The documentation at https://help.github.com/articles/syncing-a-fork/ shows three commands to keep my GitHub fork in sync with the upstream repo. git fetch upstream git checkout master git merge ...
0
votes
3answers
30 views

Why branch reported as not merged despite on it is merged

I have branch and all changes at that branch are at master (HEAD). but git diff master...feature/5492_new_currency shows me that it is not. Where am I wrong? $ git diff master...feature/...
0
votes
1answer
23 views

Git: How to convert an existing `merge` to a `merge --squash`?

I performed multiple merge commits but they should have been merge --squash instead. The conflict resolution took more than a day so I can't afford to redo the merging by hand. Is there a way to ...
0
votes
2answers
33 views

Git update my remote branch from another remote branch

We have a master branch called 'develop', so whenever we develop a feature, we will make a local feature branch from 'develop' and later merge back to develop. Now a case that, 1. User1 had to make ...
1
vote
2answers
30 views

Git: see changes on their branch since last merge on merge conflict

I thought that my scenario should be fairly common, and there must be a simpler way of doing what I do. Suppose there are two branches, current and next, for two lines of development. next at this ...
-1
votes
0answers
24 views

Git: update feature branch from develop automatically

There are a lot of very similar questions like this one: Find the parent branch of a git branch but I didn't find solution for my case(but it looks like something general, not custom). so, ...
-1
votes
1answer
32 views

On Github, merging PR into different branch

Say someone submits a PR to public/master on Github. Is there a way to merge that PR into a different branch? Otherwise, looks like I have to merge into public/master, then merge that backwards into ...
1
vote
1answer
40 views

git pull request: resolve a merge conflict properly?

I need to approve pull requests for a development we are doing. It's a distributed team scattered over the planet but it's a private (company) project. I've had two times now that I needed to resolve ...
0
votes
3answers
38 views

Merge conflict - Git rebase master which is master

So I am still newish with git and have just discovered the rebase option to update a branch with master. I ran: git checkout mybranch git rebase master Now I have a few merge conflicts. Is this the ...
0
votes
1answer
16 views

TortoiseGit merge from remote origin

have an issue with understanding of merge. I have feature-branch based on develop-branch. Time by time i would like to merge it with develop, because other developers can change it. Previously, to ...
1
vote
1answer
25 views

Do I need to merge a branch in a bare repo?

In my setup I have three repos: A bare repo on remote server (/op/git/proj.git) A non-bare repo on remote server (/var/www/proj/.git) A non-bare repo on local machine (/var/www/proj/.git) The ...
0
votes
1answer
37 views

Git merge or rebase?

I have a project in which my master branch is ahead of backup branch. Due to some issues in code we want to use the backup branch as our gold copy and overwrite the same on master. Any suggestion what ...
0
votes
1answer
24 views

“-X theirs” option does not seem to work with certain Git conflicts

This is an annoying one. I use this command to merge two branches git checkout -b temp public/master git merge -Xtheirs --squash -m "squashed with devtemp" devtemp I get some conflicts: CONFLICT (...
0
votes
2answers
58 views

How to get changes from master branch to local branch?

I have, what I assume, is a typical workflow. Our project works with pull requests. To develop new feature I create a dev. branch. By the time I am finished with the feature some changes were made ...
0
votes
1answer
16 views

git post-merge hook doesn't seems to work

I have a post-merge hook defined. I just want to test it, so I simply wrote #! /bin/sh echo "just merged" But I don't have any unusual output when merging. Thanks ahead.
0
votes
2answers
22 views

Update downstream by replacing with upstream and re-applying downstream changes, using git?

Using git, is there a good way to get the latest from upstream and re-apply our downstream changes? Instead of merging the upstream branch into the downstream branch that already contains our ...
-1
votes
0answers
32 views

When I merge with master, is there a way to avoid conflicts by pushing my version only?

When I merge with master, is there a way to avoid conflicts by pushing my version only, it's like updating my branch with master? So let's say I have the branch branchA with the file ABC. I modified ...
0
votes
3answers
25 views

How to merge parts of old commit with HEAD in git?

I tried to solve a coding problem using Method A. I committed the best working example of Method A (which I will call "Commit 5"). I wasn't fully satisfied with Method A. So I then continued ...
1
vote
0answers
29 views

gitlab changing project path

I forked some repository with only README.md/.gitignore files from specific gitlab repo on my profile, cloned it to remote repository on my desktop (git remote add gitlab "clone_url", made some work&...
0
votes
1answer
29 views

Where to create GIT tag on master or branches and merging activity

I am new to Git, I have 2 question as below, please help me to understand. I have master and testrelease branch, I am planning to merge testrelease branch to master, I want know is it I need to ...
0
votes
1answer
30 views

Resolving added and deleted conflicts Git

I have a branch release-x.x.x that I would like to merge into the master. However it has hundreds of merge conflicts when I do a pull request. I think this is due to a Swift 3 migration I performed. ...
0
votes
2answers
40 views

Git: How to discard the merging conflicts with a commit

Now I'm in a merging state. I want to discard all changes, to back to the state that before the merging, and when I do the merge again, it says "Already up-to-date". Is there a nice way to do it? My ...
0
votes
1answer
12 views

How do you merge differences in file-level differences in Team Explorer within VS 2015?

I apologise if this has been asked before, however, I can't find a solution that applies to VS 2015. I have to merge two branches together. Most of the work is fine, however, I have a specific XAML ...
2
votes
1answer
18 views

Edit all conflicting files in a git merge/rebase (special character safe)

In the middle of a git rebase, I have a status such as: $ git status --short M lib/tmuxinator.rb UU lib/tmuxinator/cli.rb UU lib/tmuxinator/config.rb A spec/fixtures/TMUXINATOR_CONFIG/...
0
votes
1answer
31 views

git stash unresolved merge conflicts

I was resolving merge conflicts and needed to get back to the old codebase to figure out how it worked before. I intuitively stashed my working copy, checked what I wanted to and applied the stash ...
3
votes
1answer
90 views

Git: merge branch into master, or master into branch

I wonder if I'm making a mistake by first merging master into another branch, and then merging it back into master. Suppose I create the following branches, each with a separate commit: ...
0
votes
1answer
34 views

How to rearange commits in few independed branches in git?

I need to rearrange a "linear structure" temp -C1-C2-C3-C4-C5-C6-C7-C8-C9-C10 / master -C0 to "fork-like structure". branch-1 -C1-C2-C3-C4-C5 / master -C0 \ ...
0
votes
1answer
18 views

Github Merge Conflict Despite Identical Lines In File

My team uses Eclipse as our IDE and Github as our repository storage for web development. We have a development site and a production site. The production site draws from the "master" branch, and the ...
0
votes
1answer
30 views

Git files needs merge, but not present

I am tryinng to merge update from a master code on another person's github page, and I have almost everything fixed. Now when I type git checkout master I get this in response: $ git checkout master &...
0
votes
1answer
26 views

Making a branch in git for some big code changes

I am making some changes to some ETL code and want to make sure I don't break anything. I have a git repo and all of the files I am working on have been committed and stored on Bitbucket. (git push ...
2
votes
2answers
34 views

Git Merge and Missing changes

I'm a bit new to GitHub. Sorry in advance if this is a noob question. I have 2 branches, Dev and Master. I worked on Dev. When I wanted to merge with Master, I did the following: $ git checkout ...
1
vote
1answer
14 views

Will files that are skipped in git cherry-pick be included in a later git merge?

I'm working on a project using Moodle 2.9.4 There is some code I would like to cherry-pick from Moodle 3 but I don't want to include some of the files updated in the commits. Eventually the project ...
1
vote
0answers
13 views

How do I apply different merge drivers for different branches

I have the following in my .git/config: [merge "customDriver"] name = A custom merge driver driver = ./mergepom %O %A %B %L %P recursive = text Where mergepom is a bashscript. In ....
2
votes
1answer
27 views

Can't change branch or commit because of unmerged files. Can't merge or stash files because I'm in the wrong branch

I went to push some files but got a merge error. I fixed it and went to merge again but got an error that I was no longer in the branch. I went to switch back to the branch but couldn't; I got an ...
1
vote
2answers
52 views

Making sure Git knows that deleting local branch is safe after PR is merged

I made a pull request to merge my-feature-branch into master on GitHub. The repo owner added one more commit to my branch, merged to master, and delete my-feature-branch using GitHub GUI. I updated ...
0
votes
1answer
16 views

How to show a list of changed files since last commit if there was a merge?

I've been using the following command to see a list of files which changed since the previous commit, and for the most part it works. git show --oneline --name-only HEAD | tail -n +2 However, ...
0
votes
2answers
33 views

How to manage a Git merge conflict with xlsx (binary)?

How to manage a Git merge conflict with xlsx (binary)? It requested to fix the conflict: $ git merge warning: Cannot merge binary files: proj/data/specs.xlsx (HEAD vs. refs/remotes/origin/master) ...
0
votes
1answer
17 views

git - Prevent / Auto Reject a Merge Request if not from specific branch

Is it possible to automatically reject/close a merge request if it did not come from a specific branch? Our current setup is: master development dev-branch dev-branch will merge to development, ...
1
vote
0answers
43 views

Git merge says up to date

I have two Git branches for my code. oldApp for the old version and the new version is on the master branch. I made some changes in the old app code, and now I want to merge them to the new app but ...
0
votes
0answers
50 views

How to identify problematic files with git merge in Visual Studio 2015?

I am using Visual Studio 2015 Update 3 with Git version control hosted by Visual Studio Team Services (VSTS). We follow the Git Workflow model, although I don't think that is actually relevant to the ...
1
vote
1answer
29 views

Creating an orphan branch but still be able to merge from another origin

Here is the scenario. I have an origin1 remote with a develop branch. This branch contains lots of commits and history. From that branch, I want do create an orphan branch (develop) into origin2 ...
0
votes
2answers
16 views

Git new branch from working branch with commits only from working branch

I've cloned repo and I have created new branch from master called working-branch. I was just doing local commits, I did not push anything yet. I want to actually first create new branch and after that ...

1 2 3 4 5 … 31