Questions tagged [git-merge] - KnowledgeHub

Questions tagged git-merge

25 questions

Sort by: Newest Votes Active

13

votes

2

answers

How to check mergeability of a branches using the github api

git-merge github-api

asked 2013-07-15T13:25:16.393

183

votes

6

answers

git remove merge commit from history

git git-merge git-rebase

asked 2013-07-10T17:44:30.567

16

votes

1

answers

What is the right way to merge branches when `git diff` shows changes but `git merge` does nothing

git git-merge git-diff

asked 2013-05-10T20:44:02.893

21

votes

2

answers

git blame: correct author after merge

git merge git-merge annotate blame

asked 2013-04-02T16:26:44.257

36

votes

1

answers

Git merging one branch into another is a two way merge?

git merge git-merge meld

asked 2013-03-06T21:25:17.723

23

votes

3

answers

tell git to use ours merge strategy on specific files

git git-merge

asked 2012-12-30T18:48:34.360

45

votes

4

answers

Are merges in Git symmetric?

git merge branching-and-merging git-merge symmetry

asked 2012-08-30T08:08:13.013

8

votes

1

answers

Git rebase after merge confused about deleted file

git git-merge git-rebase

asked 2012-08-16T10:34:57.840

16

votes

3

answers

undoing git merge after merge.renameLimit warning plus conflicts

git version-control git-merge

asked 2012-05-24T12:58:24.860

10

votes

3

answers

preventing git merge to master branch

git git-merge git-pull

asked 2011-11-17T00:09:07.767

30

votes

2

answers

How to undo a git merge squash?

git version-control git-merge

asked 2011-09-17T21:31:28.863

11

votes

2

answers

Git merge ignore spaces

git git-merge

asked 2011-08-05T12:55:57.903

47

votes

1

answers

How to re-merge a file in the git?

git git-merge

asked 2011-06-22T04:44:49.230

367

votes

8

answers

Git merge errors

git branch git-merge git-branch

asked 2011-05-15T05:47:36.680

1036

votes

15

answers

Get changes from master into branch in Git

git version-control git-merge

asked 2011-03-17T14:51:32.313

41

votes

2

answers

Git merge commits

git git-merge

asked 2011-02-08T17:45:27.787

41

votes

3

answers

Pull in changes from a Github fork

git github git-merge git-commit

asked 2011-01-03T02:36:15.680

41

votes

0

answers

Merging Branches Without Checkout

git git-merge git-checkout

asked 2010-11-11T16:55:06.210

65

votes

9

answers

Telling if a Git commit is a Merge/Revert commit

git git-merge git-commit git-hash

asked 2010-09-29T17:03:39.447

120

votes

6

answers

How Do I 'git fetch' and 'git merge' from a Remote Tracking Branch (like 'git pull')

git git-pull git-merge git-fetch

asked 2010-04-08T18:45:02.923

938

votes

11

answers

How to cherry-pick a range of commits and merge them into another branch?

git git-merge git-cherry-pick

asked 2010-01-03T09:50:23.807

349

votes

3

answers

Git Cherry-pick vs Merge Workflow

git git-merge git-cherry-pick

asked 2009-08-06T21:50:25.960

58

votes

4

answers

How to make git merge handle uncommitted changes to my working tree?

git git-merge git-stash

asked 2009-05-02T00:33:38.603

1854

votes

29

answers

How can I selectively merge or pick changes from another branch in Git?

git git-merge git-cherry-pick git-patch

asked 2009-01-16T04:55:08.973

469

votes

4

answers

When would you use the different git merge strategies?

git merge git-merge

asked 2008-12-14T19:12:11.860