EnglishChange Language
Brasil
Dansk
Deutsch
Español
Français
Italiano
Nederlands
Polski
Türkçe
Русский
简体中文Differences
This shows you the differences between two versions of the page.
|
dev:core:git [2015/08/08 21:04] mistic100 [No fast-forward] |
dev:core:git [2015/08/08 21:05] (current) mistic100 [Rebase when pulling] |
||
|---|---|---|---|
| Line 93: | Line 93: | ||
| Of course you may have conflicts during the rebase and have to manually solve them, like a normal merge. | Of course you may have conflicts during the rebase and have to manually solve them, like a normal merge. | ||
| - | **This is only for when you directly commit to ''master'' or ''2.7' !** If you are working on a feature you must not perform a rebase. | + | **This is only for when you directly commit to ''master'' or ''2.7'' !** If you are working on a feature you must not perform a rebase. |
| ==== Atomistic commits ==== | ==== Atomistic commits ==== | ||