Merges together two different branches of history by incorporating commits into the currently checked-out branch.
0
votes
0answers
5 views
How to recheck the conflict resolution in files, while doing git merge and before commiting?
I am using git. I want to merge files from branch test to my master. I did git merge --no-ff test. Now git status shows
# On branch master
# Changes to be committed:
#
# new file: a.txt
# ...
0
votes
2answers
26 views
Git merge with cloned projects (best practice)
I'm looking for the best practice for working with GIT. Here is my problem:
I have a BASE project and, for each client, I clone it. Because those projects will be very similar (only changes some ...
0
votes
2answers
29 views
git remove merge commit from history
My Git history looks like that :
I would like to get rid of the purple commits. I don't want to see them ever again. They are ugly.
I've tried to do a git rebase -i 1, but even though 1 is on the ...
0
votes
0answers
13 views
XCode still cannot parse project file, even after removing Git merge marks
I recently merged two branches of my XCode project. As expected, I had several merge conflicts to fix. Several of these merges were from additions/deletions in the project.pbxprojproject file.
I ...
2
votes
2answers
42 views
Merging git branches when one has a revert that the other doesn't want
We're working on two releases, a minor one and a major one, each with their own git branch. A feature was added originally to the minor branch before we created the major branch. Later that feature ...
0
votes
1answer
20 views
During a git merge, if I “Discard Changes” why is the file deleted?
I was merging a colleague's branch with the master branch in our project repo. When I fetched his changes and attempted to merge them into the master branch, I had a few conflicts, so I ran git ...
1
vote
2answers
30 views
Git: How does git svn fetch work?
How does git svn fetch work? Where is that branch which is fetched so that I can merge or rebase with my master or other branch? Where is the data fetched because git remote doesn't give me anything ...
0
votes
1answer
54 views
The following untracked working tree files would be overwritten by merge, but I don't care
on my branch I had some files in .gitignore
on a different branch those files are not.
I want to merge the different branch into mine, and I don't care if those files are no longer ignored or not
...
0
votes
1answer
33 views
Is it possible during a Git Merge to out put any conflicts to log file?
Doing some automation around merging a master branch into my working branch. I can easily automate the merge process and commit, but with the automation being headless and done on a schedule, is there ...
0
votes
2answers
31 views
Git: what if I forget to update before push
I consider to use git (for web development) and watched a lot of lessons at lynda.com and read some blog posts for now. But there is one question I couldn't find an answer or don't understand how it ...
2
votes
1answer
22 views
How do I merge with --no-ff in SmartGit/hg?
If you want to keep track of the moment you started a new feature-branch you can use
git merge --no-ff -m "merged feature-branch" some-feature-branch
As described here. How can I achieve this ...
0
votes
0answers
32 views
Merging existing code with a new github repo
I am working on a Site A which has branch A checked out and synced with Repo A in github.
Now I pulled Branch A from Repo A to my local comp and then created Repo B and pushed my code to Repo B.
How ...
0
votes
0answers
18 views
git-svn: merging two svn branches - add/add conflicts with no local changes
I have my repository setup with git-svn and two branches with an svn remote.
I want to merge changes from svn-trunk into the svn-branch1 and then propagate those to my local git only branches.
I am ...
1
vote
3answers
58 views
Git - difference between git pull . master vs git merge master
Having no remote repository, just one local repository with two branches.
$ git branch -a
master
* devel
Are following commands in this context the same/synonym?
$ git pull . master
and
$ git ...
0
votes
1answer
25 views
How to keep master history short and clear in git?
I have 2 remotes repository for a project.
1(origin) is my private repo where I make my modification to the project.
2(upstream) is the original github repo where I cloned(--bare) from.
From ...
