How to configure PPMC with EMC2 on 3 axis milling

jmelson wrote:

BigJohnT wrote:

It does sound to me that you put your change in master and not 2.5, if that is the case it will not be included with 2.5 by default. I always open a terminal before editing a doc and do a git branch to see what is the current branch that I'm working on.

I still am very limited in what I can do in git. Yes, I think I did put it in master. Is there a simple way to
also move these files the 2.5? I really need the git syntax, I've tried reading the git documents but am not able to make much sense of them.

Jon

You can use git cherrypick to bring something backwards from master to 2.5... let me find the exact sequence.

John

To cherrypick something

git checkout v2.5_branch
git cherry-pick [the commit ref but not with the r]

one of yours would be

git cherry-pick aaf39735ede6

I use git gui a lot as it makes it easy to switch branches and view commits by branch

to search git
gitk --grep=g98

John

BigJohnT wrote:

I use git gui a lot as it makes it easy to switch branches and view commits by branch

In "Visualise all branch history" in git-gui you can right-click to
cherry-pick a commit into the current branch.

That sure makes it easy if your always committing to master when you should be committing to a branch.

John