Hi,
just asking in case I didn't get it.
I branch off of master and do a few commits in that new branch.
If I now merge the branch back to master and master had not seen any
commits in between, it's just relocating the master "tag" and all is fine.
If however, master had seen commits as well, fast-forwarding is
performing a rebase ... is that correct?
Wouldn't rebasing be evil because it rewrites history?
Cheers
Frederik
On 10/14/19 6:29 PM, Johan Ouwerkerk wrote:
Yes, please, pretty please with cherry on top. :)
Regards,
-Johan
On Sun, Oct 13, 2019 at 10:57 PM Albert Astals Cid <aa...@kde.org> wrote:
I find the merge behavior to be not what we've been doing in phabricator so
given the idea is to maintain our workflows i'd appreciate if we can agree on
continue doing the same.
https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html
Opinions?
Cheers,
Albert
