Just so you get an answer - not saying this is the best way (there is no written policy that I know of) and there are usually more then one way to do things in git.
In my case I usually work in my local branch of master. When I get to the point of wanting to push my work, i: git push --dry-run to see if anyone has new work pushed. If they have I: git pull --rebase to put my work on top of theirs gitk to check all is good git push --dry-run check that all is still good to push git push If I am working on a private branch based on master and want to push my work : and If my private branch is behind linuxcnc's master switch to my local master and pull to bring it up to date. switch to my private branch and git rebase master now my private branch has all my new work on top of my up-to-date master, which is up-to-date to linuxcnc's master now switch to master and git merge private_branch. then do all the things I said above for pushing to linuxcnc's master. These last two statements are probably not a problem for you untill you work on existing code (though docs might be a problem) If you know your pushed work will create merge conflicts from older branches being merged up, it courteous to do the merge up to master if you can. If you push work to any older branches (like 2.7) it's courteous to merge up to master if you can. hmm maybe we should put similar instructions in the official docs some where - maybe I should look to see if they already are.. Chris M ________________________________ From: Phillip Carter <[email protected]> Sent: June 30, 2019 11:59 AM To: EMC developers Subject: [Emc-developers] Workflow I noticed today when I pushed a commit that it also pushed a message about a merge between my branches which doesn't seem correct.Currently I do all my work on my plasmac branch. I checkout master, fetch from upstream then rebase upstream/master. I then checkout plasmac and merge master.Then I pushed to upstream master.Should I be doing all my work on my master branch or is there some other way I should be doing it. Cheers, Phill _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
