4337 links
  • Arnaud's links
  • Home
  • Login
  • RSS Feed
  • ATOM Feed
  • Tag cloud
  • Picture wall
  • Daily
Links per page: 20 50 100
page 1 / 1
5 results tagged merge x
  • thumbnail
    GitHub - hartwork/git-delete-merged-branches: Command-line tool to delete merged Git branches
    August 16, 2020 at 11:10:04 AM GMT+2 - permalink - archive.org - https://github.com/hartwork/git-delete-merged-branches
    delete git merge
  • Meld

    à tester

    August 10, 2019 at 1:42:04 PM GMT+2 - permalink - archive.org - https://meldmerge.org/
    diff git merge tool
  • thumbnail
    Difference between git pull --rebase and git pull --ff-only - Stack Overflow
    What will happen if I use git pull --rebase ?

    git pull --rebase is roughly equivalent to

    git fetch
    git rebase origin/master

    i.e. your remote changes (C) will be applied before the local changes (D), resulting in the following tree

    A -- B -- C -- D

    What will happen if I use git pull --ff-only ?

    It will fail.

    git pull --ff-only corresponds to

    git fetch
    git merge --ff-only origin/master

    --ff-only applies the remote changes only if they can be fast-forwarded. From the man:

    Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward

    Since your local and remote branches have diverged, they cannot be resolved by a fast-forward and git pull --ff-only would fail.

    December 21, 2016 at 8:45:23 AM GMT+1 - permalink - archive.org - http://stackoverflow.com/questions/25430600/difference-between-git-pull-rebase-and-git-pull-ff-only
    ff git merge
  • Fugitive.vim - resolving merge conflicts with vimdiff

    :Gdiff
    :dp

    December 9, 2016 at 2:47:25 PM GMT+1 - permalink - archive.org - http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
    fugitive merge vim
  • How to resolve git merge conflicts with Vim - Flaviu Simihaian's Blog - Entrepreneur and Developer

    \o/

    December 9, 2016 at 9:54:02 AM GMT+1 - permalink - archive.org - http://flaviusim.com/blog/how-to-do-a-git-merge-with-vim/
    git merge vim
Links per page: 20 50 100
page 1 / 1
Shaarli - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community - Help/documentation