0
votes
2answers
24 views
Git merge gives conflicts for almost all files changed from only one branch
I tried to merge my local branch with our development branch, but git merge gave me conflict for almost all files that were changed in local branch. So I had to resolve conflicts manually. Most of ...
0
votes
2answers
23 views
Reverting branch in git
I've been working in a branch, say master. Changes are already pushed to remote repository. My history looks like this:
*----*----*----* master
Then I realize that I may have done something wrong ...
0
votes
1answer
25 views
Git : Confuse after merge [duplicate]
I am new to git. Recently, I merged some code from feature to master branch. After merging my .gitignore file looks like this
<<<<<<< HEAD
gen/
bin/
=======
gen/
...
0
votes
1answer
16 views
Merge specific commit from official repo into local repo
Suppose on 1st Jan, I forked (origin) and cloned(local) a github repo(upstream). I created a branch X on its master. And, started working on X. Over the time, I kept pushing the commits to origin.
I ...
0
votes
2answers
32 views
How do I manually merge a branch in git?
I merged a relatively old branch into master and the outcome of the merge was an unholy mess. For some unknown reason when I ran git merge it automatically took some of the out of date code that had ...
0
votes
2answers
26 views
How do I merge a master branch's changes into my side project branch in one git commit?
I have a "project" branch that was created off of a "master" branch about a month ago. I'm trying to bring in all of the changes from the master branch into the project branch while still keeping the ...
0
votes
1answer
34 views
Git: How do you merge a file with a version of itself from a previous commit?
There are some changes I made to a file in a commit A, then I undid the changes by mistake and went on further to make changes in commits B and C.
I want the changes in commit A to be in my file, but ...
-3
votes
1answer
100 views
How can I fix this rebase and prevent this from happening again? [duplicate]
I was rebasing several local commits into one before pushing to my GitHub repository, but apparently I didn't understand merging well enough and created this mess. How can I get rid of this extra ...
0
votes
3answers
27 views
Git - rolling back to a previous commit without losing work
I had previously been working on features and merging them into a master branch only. Now, i need to maintain master as a stable-feature-only branch and then work on a dev branch to build new ...
0
votes
3answers
23 views
Handling Files in Git that need to different in every branch
I'm asking myself how to handle the following situation.
I have two different branches on two different production systems with config xml files in a folder that I want in Git and need to be ...
0
votes
1answer
19 views
Merging two versions of a project with git
Consider the following scenario. There're two git repos, representing two versions of project P. Repo A has P v0.1 with some custom patches and repo B has P v0.2 without these patches. How to merge ...
0
votes
1answer
44 views
Manually resolve git merge conflicts with source tree
I am using source tree on my mac for my git repositories. I merged two branches with a conflict in product.php. Now I have the following files:
product.php.BACKUP.43706.php
product.php.BASE.43706.php
...
0
votes
1answer
91 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
2answers
49 views
Moving Git repository content to another repository preserving history
I am trying to move only the contents of one repository (say repo1) to another existing repository (say repo2) using the following commands;
git clone repo1
git clone repo2
cd repo1
git ...
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 ...
