Resolving merge conflicts

suggest change

Found a mistake? Have a question or improvement idea? Let me know.

Resolving merge conflicts:

* Resolving merge conflicts

* Manual Resolution

Table Of Contents

0 Getting started

1 Committing

2 Browsing the history

3 Undoing

4 Staging

5 Git diff

6 Merging

7 Ignoring files and folders

8 Working with remotes

9 Submodules

10 Aliases

11 Rebasing

12 Configuration

13 Branching

14 rev-list

15 Squashing

16 Cherry picking

17 Recovering

18 git clean

19 .gitattributes

20 .mailmap

21 Different workflows

22 Pulling

23 Hooks

24 Cloning repositories

25 Stashing

26 Subtrees

27 Renaming

28 Pushing

29 Internals

30 git-tfs

31 Empty directories in git

32 git-svn

33 Archive

34 Rewriting history with filter-branc

35 Migrating to git

36 Show

37 Resolving merge conflicts

38 Bundles

39 Display commit history graphically with gitk

40 Bisecting to find faulty commits

41 Blaming

42 Git revisions syntax

43 Worktrees

44 Git remote

45 Git large file storage

46 git patch

47 git statistics

48 git send-email

49 git gui clients

50 reflog - restoring commits not shown in git log

51 TortoiseGit

52 External merge and diff tools

53 Update object name in reference

54 Git branch name on Bash Ubuntu

55 Git client-side hooks

56 Git rerer

57 Change git repository name

58 git tagging

59 tidying up your local and remote repository

60 diff tree

61 Contributors