rebase   1932

« earlier    

ChangesetEvolution - Mercurial
How Mercurial supports rebasing without changing history....apparently.

Note that "hg rebase", the Firefox extension, actually *does* rewrite history.
hg  rebase 
5 days ago by kc5tja
git svn - Why is the meaning of “ours” and “theirs” reversed with git-svn - Stack Overflow
whatever HEAD's pointing to is "ours"

(and the first thing a git rebase upstream does it to checkout the upstream branch on top of which you want to rebase: HEAD refers to upstream -- ours now
git  rebase  ours  HEAD  theirs 
15 days ago by ebouchut
merge - What is the precise meaning of "ours" and "theirs" in git? - Stack Overflow
.
Merge
-------

git checkout develop
git merge feature

* If you want to select the version in develop:
git checkout --ours README.md

* If you want to select the version in feature:
git checkout --theirs README.md

Rebase
--------

git checkout feature
git rebase develop

If you want to select the version in develop:
git checkout --ours README.md

If you want to select the version in feature:
git checkout --theirs README.md
git  merge  rebase  ours  theirs  branch  learn  other 
16 days ago by ebouchut
Getting solid at Git rebase vs. merge
A git merge should only be used for incorporating the entire feature set of branch into another one, in order to preserve a useful, semantically correct history graph. Such a clean graph has significant added value.

All other use cases are better off using rebase in its various incarnations: classical, three-point, interactive or cherry-picking.
git  git-merge  git-rebase  rebase  merge 
18 days ago by vaupeh
git rebase | Atlassian Git Tutorial
Rebase is one of two Git utilities that specializes in integrating changes from one branch onto another.<br/>
git  rebase 
19 days ago by lgtout
Merging vs. Rebasing | Atlassian Git Tutorial
Compare git rebase with the related git merge command and identify all of the potential opportunities to incorporate rebasing into the typical Git workflow
merge  rebase  git  explanation 
19 days ago by lgtout
--force considered harmful; understanding git's --force-with-lease - Atlassian Developers
The problem here is that when doing a force push Bob doesn't know why his changes have been rejected, so he assumes that it's due to the rebase, not due to Alice's changes. This is why --force on shared branches is an absolute no-no; and with the central-repository workflow any branch can potentially be shared.

But --force has a lesser-known sibling that partially protects against damaging forced updates; this is --force-with-lease.
git  scm  dvcs  rebase 
22 days ago by jefframnani
Four helpful guides for grasping the ever-elusive concept of git rebase
You can get by with a limited grasp, but you are going to want to improve over time. git rebase is one of those commands that causes a lot of ongoing confusion, it's an evergreen topic to say the least.
git  rebase 
28 days ago by vegarev

« earlier    

related tags

amend  answered  article  atlassian  author  autosquash  before  bestpractice  bestpractices  bfg  bitbucket  body  branch  branches  change  checkout  clean  cli  code  command-line  command  commands  commit  commits  comp2931  comparison  config  criticism  criticisms  cygwin  dammitbrain  delete  detach  detached  dev-git  dev  development  devops  difference  differences  dlls  docker  docs  documentation  dvcs  edit  email  example  exit  explanation  filter-branch  first  fixup  force  fork-point  git-merge  git-rebase  git  gitflow  github  gitmerge  graph  head  hg  history  howto  humor  important  initial  insert  interactive  issue  jthill  june  learn  list  management  master  meld  merge  message  mnemonic  modify  must-know  name  newbie  opinion  origin  other  ours  overflolw  override  overwrite  productivity  programming  pull  push  questions  quit  rebasing  reference  remaster  reset  revert  rewrite  root  rust  scm  shell  skip  so  softwareengineering  squash  stack  stackoverflow  starred  stash  suggestion  team  theirs  tip  tips  title  tolearn  tools  toread  totry  tounderstand  tutorial  tweet  twitter  upstream  usecase  vcs  version_control  versioncontrol  versioning  vi  vim  visual  windows  workflow 

Copy this bookmark:



description:


tags: