Linked Questions
60 questions linked to/from Git workflow and rebase vs merge questions
0
votes
2
answers
974
views
Is rebasing the best strategy to merge the branches [duplicate]
I have a parent branch and child branches.
when I want to merge a child branch into a parent branch , it's said that Re-basing the branch is the best way to merge.
If we're rebasing all the ...
- 171
0
votes
1
answer
131
views
If Git finds merge conflict, how can i fix that in revision control? [duplicate]
i always work with branches. But sometimes, a particular changeset is in conflict with an another branch's changeset.
Changeset 1 added new code
changeset 2 from branch 2 is based on the old code. (...
- 803
0
votes
0
answers
35
views
What is the difference when I rebase a feature branch into master vs rebase a master onto feature, and when to use them? [duplicate]
I wonder if someone can clarify what the following git actions do:
What happens when we checkout master and git merge feature?
What happens when we checkout master and git rebase feature?
What is the ...
- 599
2417
votes
19
answers
988k
views
When do you use Git rebase instead of Git merge?
When is it recommended to use Git rebase vs. Git merge?
Do I still need to merge after a successful rebase?
- 50k
1354
votes
11
answers
1.2m
views
How to merge a specific commit in Git
I have forked a branch from a repository in GitHub and committed something specific to me. Now I found the original repository had a good feature which was at HEAD.
I want to merge it only without ...
- 15.7k
1010
votes
15
answers
1.3m
views
Get changes from master into branch in Git
In my repository I have a branch called aq which I'm working on.
I then committed new work and bugs in master.
What is the best way to get those commits into the aq branch? Create another new ...
- 28.1k
519
votes
5
answers
181k
views
What are the differences between git branch, fork, fetch, merge, rebase and clone?
I want to understand the difference between a branch, a fork and a clone in Git?
Similarly, what does it mean when I do a git fetch as opposed to a git pull?
Also, what does rebase mean in ...
- 5,706
155
votes
6
answers
59k
views
Git branching strategy integated with testing/QA process
Our development team has been using the GitFlow branching strategy and it has been great !
Recently we recruited a couple testers to improve our software quality. The idea is that every feature ...
- 13.3k
85
votes
6
answers
80k
views
How to avoid merge commits from Git pull when pushing to remote
I have a repository and some local changes to commit.
Before committing, I pulled the changes onto my local using Egit in Eclipse.
It creates a merge commit and I submit my commit over it.
Now when ...
- 941
88
votes
6
answers
39k
views
What are the advantages of keeping linear history in Git?
When I was taught using Git with central repo (project on Gitorious) I was told to always use rebase instead of merge because we want to have linear history. So, I have always been trying to work that ...
- 1,442
81
votes
2
answers
100k
views
Git: getting changes from another branch
I have a project which uses git and I'd like to start a new branch to add a major new feature.
Under the main branch, I'll continue to add bug fixes and minor features. At regular intervals I'd like ...
- 7,757
59
votes
5
answers
23k
views
Git rebase loses history, then why rebase?
I've been looking into rebasing with Git over the past couple days. Most of the arguments for rebasing say that it cleans up the history and makes it more linear. If you do plain merges (for example), ...
- 753
64
votes
6
answers
77k
views
Android Studio Update Project: Merge vs Rebase vs Branch Default
Apologies if this seems redundant as I know there are fair amount of questions regarding Merge vs Rebase, but there doesn't seem to be any that throw in 'Branch Default' as well.
You are given a ...
- 3,295
51
votes
7
answers
43k
views
After a Git merge conflict, a lot of files I didn't touch become changes to be committed
So I'm working in a branch, make some changes, and run git merge master. I get a merge conflict on one of the files I modified (which I know how to deal with), but for some reason, a bunch of files I ...
- 30.3k
26
votes
5
answers
15k
views
Avoid unwanted merge commits and other commits when doing pull request on GitHub
I forked a project on Github.
Let the remote upstream be upstream and my remote repository be origin.
My local master branch is set to track the remote master branch.
Then I added some stuff in local ...
- 1,949