[L2Ork-dev] git rebase

[Jonathan Wilkes]

On Tue, Jul 7, 2020 at 5:15 PM Albert Graef <aggraef at gmail.com> wrote:
>
> On Tue, Jul 7, 2020 at 10:33 PM Jonathan Wilkes <jon.w.wilkes at gmail.com> wrote:
>>
>> The problem I have is that rebase -i doesn't play well if you've been
>> merging with master to keep up to date. It seems like
>> the branch's commits related to the feature then get interleaved with
>> whatever got committed in master.
>
>
> Yes, that's exactly what `git merge` does, which is why I suggest using `git rebase` on feature branches instead. Then you don't have that problem, and `git rebase -i` will work nicely if you don't go crazy with it  -- e.g., like trying to reorder a history which has one commit depending on another, that just won't work; but squashing and rewording commits, even splitting commits when it becomes necessary, will all work fine.

If I'm incrementally committing on a feature branch *and* I have a
need to merge in master to pull in recent changes,
does that mean I have to rebase -i and clean things up *before* I
merge in master?

-Jonathan

>
> --
> Dr. Albert Gr"af
> Computer Music Research Group, JGU Mainz, Germany
> Email: aggraef at gmail.com, web: https://agraef.github.io/
> _______________________________________________
> L2Ork-dev mailing list
> L2Ork-dev at disis.music.vt.edu
> https://disis.music.vt.edu/listinfo/l2ork-dev