3 ms·
Don't pull origin/master directly into local feature/test branch. Pull into local master then rebase local branch onto it.
by mattengi 13y ago
Don't pull origin/master directly into local feature/test branch. Pull into local master then rebase local branch onto it.
- lmm 13y agoThis goes against all the advice I've seen elsewhere; we push our feature branches all the time, and sometimes pull from each other's if we're working in overlapping areas, so we need to not rebase them.
- Crito 13y agoIf that's what you want to do, that is fine, but you are no longer using a centralized process if you do it that way. Git allows you to follow a centralized process perfectly fine. However if you choose to not follow a centralized process, it will not force you to.