git merge --no-commit with edits
If I use
git merge --no-commit <other-branch>
and then make changes, such as removing files from the merge, is this still a real merge?
I would like the branches to be related (with a merge), but I don't want all of the changes in the in the new branch.
As a more concrete example, other-branch is a release branch from an older version. The current branch is the develop branch of the current product. We've made some changes for the release branch that should be moved to the develop branch.
We've used cherry-picks in the past, but I feel like there may be an advantage to having git understand a relationship between the two branches.
Is an edited merge still a merge?
I'm trying to merge changes made in the master branch of my repository into a development branch using git or TortoiseGit. I know that I can just use either a git pull or a merge, but this merges in t
I have had a look at git rebase vs git merge But I'd like to be sure about which solution to choose in this case : I want to implement a new feature on Master so i branch it to a new Feature branch. I
in my master branch somehow was merged another branch that should not be merged there. Are there a git command(s) that can tell me who did the merge and when the merge was done? I don't have the merg
As above, is it possible to export an SVN repo with history into a new Git repo and then use Git to do a merge from a branch back into the trunk?
I am new to Git and I have some conceptual doubts. My GitHub repository has 2 branches, develop and production. I code on the develop branch, and when it is ready I merge into production. Some things
How could I merge several, selected commits from branch B into A. I did this but I am not sure if there is a one line solution for this: git log -p -1 B~~ | git apply git log -p -1 B~ | git apply git
We're using gitlab. Master branch is protected and only project owners can commit/accept merge requests to the master. Other developers send a merge request to get their code into master. When we send
I understand that if I have a branch ready to merge with remote master, I need to do: git checkout 'my branch' git rebase master (rebase because I want simple history + my changes are minuscule enoug
I am having some unexpected results that seem to be based on the ordering of branches given to git merge when performing an octopus merge. The following script will replicate my situation #!/usr/bin/e
Developer A is working on branch 2012A I branch 2012A, and create branch 2012B I want all the new changes from 2012A, so I simply want to merge them into 2012B and carry on working. Does this look ok
I have 20 files in my repository foo1.c,foo2.c,...foo20.c I am working on foo2.c Now whenever I do a git pull it pulls in and merges changes to all foo*.c including foo2.c I would like to prevent auto
I am using git extensions to merge by branches. However, I see same branch listed multiple times with different paths. I know that they refer to the same thing but why are they listed multiple times ?
I work on a project that has 2 branches, A and B. I typically work on branch A, and merge stuff from branch B. For the merging, I would typically do: git merge origin/branchB However, I would also li
I found some other questions that talk about a reverse merge in Git, but those questions are asking how to reverse merge an ENTIRE commmit. I want to reverse merge one directory in my tree. Is this po
I had an interesting thing happen using git, wondering if anyone could explain it to me so I can understand better. When doing a merge of multiple branches (A,B), git merge A B fails as non-fast-fo
This question already has an answer here: How do you revert a faulty git merge commit 2 answers I've stumbled upon this problem with my repo: I have the following structure of my branch tree:
Every time i run a git merge command it opens the text editor asking me to add an extra message. How can I stop git from opening the editor & simply merging my branches? Because when it opens the
I'm creating a merge driver. I have defined a .gitattributes file as follows: filename merge=mergeStrategy I have created the merge driver in $PROJECT/.git/config as follows: [merge mergeStrategy] n
I understand that re-base is good for situations when you want to add a fix to a base branch and put it in all other branches. but it seems much more complicated than a merge(much more conflicts). Am
Using git bisect I found the culprit commit - it is a merge commit (I'm on the master branch) I'm trying to isolate the buggy code but the merge included some commits from the merged branch and I don'
In a 'git merge ' I would like any difference, even if not normally a merge conflict, to be considered a merge conflict. Then, with 'git mergetool' I can see and resolve each and every difference. I t
When merging topic branch B into A using git merge, I get some conflicts. I know all the conflicts can be solved using the version in B. I am aware of git merge -s ours. But what I want is somet
Guess I've a feature branch (so not master) which I changed (e.g. amend a commit, rebased or so) so it has non-fast-forward commits waiting for fetch/merge. How can I do this? When I git fetch, git te
My local repo was looking like that before I had to pull: [my commit 3] <- to be pushed [my commit 2] <- already pushed [my commit 1] So I pulled and had to do a merge because there were confli
I have two files A and B in master. I created a branch feature where I modified both A and B. Then, someone else deleted B and renamed A to B in master (using git mv). When I merge feature into master
I am not certain I can trust Git to merge automatically. Here is a scenario. Create a program in the master: MOVE 0 TO I. A. PERFORM X-PROC. IF I IS EQUAL TO 25 THEN GO TO A. Developer 1 makes a bra
Assuming you have this: master: o--o--o development: `o--o--o I want to merge the changes back as one commit (avoiding all the junk commits along the way): git checkout master git merge --squash dev
I have mainProject on git, with a shared library. This shared library is also in subProject. my workflow I start my project by cloning the project and create a branch : git clone https://github.com/us
I need to merge two Git repositories into a branch new, third repository. I've found many descriptions of how to do this using a subtree merge (for example Jakub Narębski's answer on How do you merge
Given repo Foo and repo Bar. I want to merge Bar with Foo, but only into a separate branch, called baz. git checkout -b baz <= put the Bar repo here.
First of all - I'm new to git. Now, I have a project using git and github. I have 2 machines at home and 1 at work. I can push and pull from remote while at home, but at work we have some extreme prox
Is there any difference between git merge --no-commit and git cherry-pick --no-commit? And is there any difference in history if I commit after these two commands?
In man git-merge doc, git merge -s recursive -X ours: This should not be confused with the ours merge strategy, which does not even look at what the other tree contains at all. It discards everything
I have created a new branch from an existing branch: git checkout master git checkout -b test then in the new branch I've renamed a file: git mv foo.txt fooOld.txt git mv fooNew.txt foo.txt git commi
I understand that Araxis Merge is now a fully supported mergetool for Git, so that much of what I can find about configuring Git to use it is now out of date. In particular, Araxis Merge should work
I've one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the commit level instead of the file/directory level. One of the side effects is that you
Is git's merge conflict resolution inherently more efficient than other SCMs (CVS,Subversion,etc.), and also standalone merge tools? If so, why? Clarification: here I'm more interested in the algorith
I have a project, which consists of several separate Git repositories (merge several Maven projects each with a separate Git repository). Now I want to create one Git repository and put the contents o
When I do git merge from another branch to current workspace, git sometimes makes a new commit: Merge remote-tracking branch xxx into xxx Sometimes, it does not: Fast-forward ... src files ... So wh
I have a bunch of remote (tracking) branches that I have created local branches from (so I can write, commit and push) eg. origin/myfeature. Now I would like to merge origin/myfeature into master. I c
When I use git format-patch, it doesn't seem to include merges. How can I perform a merge and then e-mail it to someone as a set of patches? For example, let's say that I merge two branches and perfor
My Git repository has two files, alpha and beta, with identical content. If I delete alpha in my master branch, and edit it in my feature branch, then when I merge master into feature, I'm warned abou
I've been using git for a few years, and every once in a while when doing a merge, git reports some bizarre conflicts. Here's an example of an .htaccess file, from when I merged in the new 7.24 releas
GIT p4merge - 2 or more conflict in same file I have integrated p4merge with GIT and i came across this situation once. I have a file with merge conflicts. The file say foo.c has merge conflicts in 3
After fetching from remote using git fetch, we need to use something like git merge origin/master I would like to know if this command also does git commit at the same time? Is the order origin/maste
When I'm doing git merge, it opens editor where predefined message Branch merged to is printed, all I have to do is to save file and quit. Previously it didn't ask me to enter anything and didn't o
Scenario: Computer A and Computer B have each cloned a git repository from Github. On Computer A, I make changes to a repository, commit, and push to Github. On Computer B, I make changes to other, u
We ran into a strange git merge issue. We have 2 repos (simplication below). The PublicRepo is where we do most development on and every now and then we pull/merge changes into PrivateRepo. https://g
When I resolve a conflict, I have a merge commit in addition to the real commit I've made. It looks as following: Merge branch 'master' of http://myDomain.com/git/SIMULATOR What is the best way to
I want to merge branch jb-mr1-release my git branch is jellybean How to merge from Android googlesource into jellybean?