Tagged Questions

-1
votes
3answers
38 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 ...
1
vote
2answers
31 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 ...
1
vote
1answer
33 views

Can git figure out that the branch to be merged has obsolete changes?

I am new in git and I am find it hard to wrap my head around the fact that everything is around snapshots/commits and not individual files. So assume that I have a tree in my repository as follows. ...
0
votes
1answer
34 views

Git rebase changes onto master from an ancestor

So i've got the following situation where we branched for our release and continued enhancements are being added to master. A---B---C---Q---W---E---R---T master \ / D---E---F ...
3
votes
1answer
45 views

Is rebase and merge the same thing? Why are there 2 different procedures to do one thing?

I am new to git and I am trying to understand the rebase. For me the merge process is easier to understand since my experience is in Clearcase. So first of all I can not understand if rebase is ...
1
vote
2answers
63 views

Git merging/rebasing strategy for single user development

I'm using git for a c++ project, and I'm the sole developer. In addition to maintaining code history, I'm using git because I want to be able to test a new feature without modifying the original code ...
1
vote
0answers
57 views

Keep svn repository in sync with git one

my team mate and I are struggling to get our svn repository in sync with our git one. We are working on a project and we are requested to share our code on an svn repository (hosted by the ...
0
votes
2answers
50 views

Git - Merge a part of branch commits

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 ...
1
vote
1answer
74 views

Is it true that `rebase' leads to a fewer number of conflicts than `merge'?

From time to time I stumble upon a statement that 'git rebase' leads to a fewer number of conflicts than 'git merge', for example here: why does git rebase often have fewer merge conflicts than a ...
1
vote
1answer
79 views

Merging several commits into one in Git

I have a single branch git repository, that has ~4000 commits. I want to group the commits according to dates they were created. For example, given the commits below: abcd 2013-4-1 12:10 abce ...
3
votes
2answers
176 views

git: what is the correct merging or rebasing workflow to modify a maintenance branch and apply those patches to another branch?

Objective: I need to make custom patches to a prior release of an upstream project, and I want to be able to apply those patches to the later version. Problem: Rebasing from the maintenance branch ...
0
votes
1answer
96 views

Stuck on git rebase while merging diverged branches

I have a local branch with 5 commits not in remote branch while remote branch has 6 commits not in my local branch. I squashed my local commits into a single commit, now i have 1 commit in local ...
2
votes
4answers
303 views

can't push to branch after rebase

We use git and have a master branch and developer branches. I need to add a new feature and then rebase the commits to master, then push master to CI server. The problem is that if I have conflicts ...
3
votes
2answers
381 views

Git: How to properly merge two functional and quite different branches?

Imagine a situation where you have two branches of the same project, with one part of the first branch dramatically refactored over the other one. But for a while you need to keep both branches ...
2
votes
1answer
77 views

How can I undo a git rebase that's already been pulled/merged?

I'm in an odd predicament - we had a developer perform a "git pull --rebase" across branches multiple times, and I'm trying to repair the damage. Our graph originally looked like this: [master] A--B ...

1 2 3 4
15 30 50 per page