Ask Justin Frankel

justin = { main feed , music , code , askjf , pubkey };

Ask Justin Frankel
No reasonable question unanswered since 2009!

Suggested topics: programming, music, sleep, coffee, etc.

Note: please do not ask questions about REAPER features, bugs or scheduling, use the forums instead.

[back to index] | [unreplied] | [replied] | [recent comments] | [all]

Question: What's your typical GIT merge strategy? straight merge? squashed merge?
Asked by Will (24.234.128.x) on October 7 2010, 3:39pm
Reply on October 7 2010, 7:23pm:

Well, I like to try to get my commits in a logical order, I'll squash if there's stuff that is related that belongs together (i.e. if I committed some changes, and forgot to get some related code updated). For very small stuff I'll rebase for the upstream server, for larger I find it better to show the intent (i.e. in case there are some changes in the origin that interact with my changes.

Comment:

    Your Name:   -- Site Owner's Name:  (for human-verification)

    Comment:

[back to index] | [unreplied] | [replied] | [recent comments] | [all]