Le Fri, 16 Apr 2021 14:53:35 -0400, Ted Felix <t...@tedfelix.com> a écrit :
> I just posted a significant rewrite of the "Using git" page to get > rid of the degenerate "simplified" developer workflow that actually > causes all sorts of problems. This version of the document just > walks through the simple read-only test workflow and the > forking/branching development workflow. > > Hopefully no one got too far into the original version. If so, > just start over and things should be clearer and more reliable. > > Comments appreciated. > Thanks Ted, Your operating manual is very clear. I understand that the first simplifiate workflow was : - Commit modifications on the local master - Push them on the remote fork master and send a pull request - Then the remote fork will be merged to the original master - Now if I fetch changes from upstream, I'm going to get merge conflicts because changes are already on the local master. and the new better workflow is : - Commit modifications on a local branch - Push them on the same branch of the remote fork and send a pull request - Then the branch of the remote fork will be merged to the original master - Now if I fetch changes from upstream, they are merged to the local master without any conflict because the initial changes are on a branch and not on this master. - Then I can delete the branch which is now useless. Is this correct ? Yves _______________________________________________ Rosegarden-devel mailing list Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
