Ci-dessous, les différences entre deux révisions de la page.
Prochaine révision | Révision précédente | ||
bzr_to_git [2014/05/07 10:23] mart créée |
bzr_to_git [2019/04/02 11:14] (Version actuelle) |
||
---|---|---|---|
Ligne 1: | Ligne 1: | ||
====== Bazaar to Git ====== | ====== Bazaar to Git ====== | ||
+ | |||
+ | ===== local changes ===== | ||
+ | |||
+ | Can not do ''git pull'' with local changes, first stash or revert it | ||
* ''**bzr shelve**'' -> ''git stash'' | * ''**bzr shelve**'' -> ''git stash'' | ||
* ''**bzr unshelve**'' -> ''git stash pop'' | * ''**bzr unshelve**'' -> ''git stash pop'' | ||
+ | * ''**bzr revert myfile.py**'' -> ''git checkout %%--%% myfile.py'' | ||
+ | * ''**bzr revert**'' -> ''git checkout %%--%%'' | ||
+ | |||
+ | ===== uncommit ===== | ||
- | //required to stash changes before doing ''git pull''// | + | http://stackoverflow.com/a/2530073/147904 |