[L2Ork-dev] Bunch of commits and a merge request from my branch

[Albert Graef]

Yeah, git can be a big pita, we've all been through that hell before. :)

The simple recipe to stay sane when using git along with a merge and pull
request system like on Github, Gitlab et al (which *is* very convenient
when used properly), is this:

1. Create a separate branch for *each and every* merge request. *Never* use
the master branch for that, as you'll need it to stay in sync with upstream
for the final rebase and squash.

2. Just keep committing and pushing to that branch until Jonathan is happy.
:)

3. When Jonathan is happy and asks you to tidy up your branch, rebase it on
the current master (which usually *will* have progressed since you created
your branch) and maybe squash your commits (`git rebase -i') to tidy up the
history of your changeset. Force-push the branch with `git push -f`. That
way the history stays as clean and as linear as possible, which is always a
good thing (TM).

4. Jonathan merges your request and happiness ensues. ;-)

At least that's the workflow I've learned and have been happy with. I don't
think that this is written down somewhere, but it's tried and proven, and
it's just how everybody does it.

HTH,
Albert


On Mon, Jun 8, 2020 at 7:21 PM Ivica Bukvic <ico at vt.edu> wrote:

> I see. It's because I did not deal with branches properly. The silver
> lining it is included as part of the ggee merge request :-)
>
> Best,
>
> Ico
>
> --
> Ivica Ico Bukvic, D.M.A.
> Director, Creativity + Innovation
> Institute for Creativity, Arts, and Technology
>
> Virginia Tech
> Creative Technologies in Music
> School of Performing Arts – 0141
> Blacksburg, VA 24061
> (540) 231-6139
> ico at vt.edu
>
> www.icat.vt.edu
> www.performingarts.vt.edu
> l2ork.icat.vt.edu
> ico.bukvic.net
>
> On Mon, Jun 8, 2020, 12:53 Jonathan Wilkes <jon.w.wilkes at gmail.com> wrote:
>
>> On Mon, Jun 8, 2020 at 12:26 AM Ivica Bukvic <ico at vt.edu> wrote:
>> >
>> > See the ggee/image commit. I posted a comment in there showing all the
>> links to the various commits that are all self-contained. See:
>> https://git.purrdata.net/jwilkes/purr-data/-/merge_requests/348
>> >
>> > Small typo fix: ico/purr-data at 958feb39
>> >
>> > Improved highlighting and coloring of inlets and visual improvements
>> (see squashed description for details): ico/purr-data at 08da6464
>> >
>> > Introduced a way to allow externals to properly reposition themselves
>> when being autopatched in case they don't conform to the standardized
>> spacing and/or don't stay true to their xy being the top-left point of
>> origin (see squashed description for details): ico/purr-data at 4cb1f899
>> >
>> >
>> > Also, ATOMBUFSIZE in g_text.c is still missing the increase to 160
>> characters...
>>
>> You made a merge request wrt ATOMBUFSIZE, I made a comment on the
>> merge request, and now I don't see the
>> merge request anymore:
>>
>> https://git.purrdata.net/jwilkes/purr-data/-/merge_requests/336
>> _______________________________________________
>> L2Ork-dev mailing list
>> L2Ork-dev at disis.music.vt.edu
>> https://disis.music.vt.edu/listinfo/l2ork-dev
>
> _______________________________________________
> L2Ork-dev mailing list
> L2Ork-dev at disis.music.vt.edu
> https://disis.music.vt.edu/listinfo/l2ork-dev



-- 
Dr. Albert Gr"af
Computer Music Research Group, JGU Mainz, Germany
Email: aggraef at gmail.com, web: https://agraef.github.io/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://disis.music.vt.edu/pipermail/l2ork-dev/attachments/20200608/5c94507f/attachment-0001.html>